• Bug#265440: ksimus: FTBFS with gcc-3.4: extra `;' (3/3)

    From Andreas Jochens@1:229/2 to All on Fri Aug 13 10:50:11 2004
    [continued from previous message]

    +template <> EnumDict<ModuleViewType>::tData EnumDict<ModuleViewType>::data[]
    = { {"Generic", MV_GENERIC},
    {"User View", MV_USERVIEW},
    {"Pixmap", MV_PIXMAP},
    @@ -82,7 +82,7 @@
    }


    -EnumDict<ModulePixmapStoreType>::tData EnumDict<ModulePixmapStoreType>::data[] +template <> EnumDict<ModulePixmapStoreType>::tData EnumDict<ModulePixmapStoreType>::data[]
    = { {"Absolute", MPS_ABSOLTUE},
    {"Relative Module", MPS_RELATIVE_MODULE},
    {"Internal", MPS_INTERNAL},
    @@ -148,7 +148,7 @@
    const QSize & ModuleData::getGenericSize() const
    {
    return m_genericSize;
    -};
    +}

    PointList * ModuleData::getGenericConnPos()
    {
    @@ -159,12 +159,12 @@
    m_connPosGeneric->setAutoDelete(true);
    }
    return m_connPosGeneric;
    -};
    +}

    const QSize & ModuleData::getPixmapSize() const
    {
    return m_pixmapSize;
    -};
    +}

    PointList * ModuleData::getPixmapConnPos()
    {
    @@ -175,7 +175,7 @@
    m_connPosPixmap->setAutoDelete(true);
    }
    return m_connPosPixmap;
    -};
    +}

    OrientList * ModuleData::getPixmapConnOrient()
    {
    @@ -186,7 +186,7 @@
    m_connOrientPixmap->setAutoDelete(true);
    }
    return m_connOrientPixmap;
    -};
    +}

    /** returns a pointer to the pixmap
    Creates an empty pixmap, if not exist */
    @@ -280,7 +280,7 @@
    m_connPosUserView->setAutoDelete(true);
    }
    return m_connPosUserView;
    -};
    +}

    OrientList * ModuleData::getUserViewConnOrient()
    {
    @@ -291,7 +291,7 @@
    m_connOrientUserView->setAutoDelete(true);
    }
    return m_connOrientUserView;
    -};
    +}


    /** Search externals in compList */
    diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/enumdict.h ./ksimus/tools/enumdict.h
    --- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/enumdict.h 2001-11-24 02:11:32.000000000 +0100
    +++ ./ksimus/tools/enumdict.h 2004-08-13 09:01:10.623853169 +0200
    @@ -136,7 +136,7 @@
    const T * EnumDict<T>::find(const char * name) const
    {
    return (const T *)EnumBaseDict::find(name);
    -};
    +}
    template<class T>
    T EnumDict<T>::find(const char * name, T defaultValue) const
    {
    diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbaseuint.cpp ./ksimus/tools/ksimbaseuint.cpp
    --- ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbaseuint.cpp 2002-08-05 23:44:00.000000000 +0200
    +++ ./ksimus/tools/ksimbaseuint.cpp 2004-08-13 09:02:07.652183545 +0200
    @@ -39,13 +39,13 @@
    m_base(Decimal)
    {
    setText(text);
    -};
    +}


    void KSimBaseUInt::setText(const QString & str, bool * ok)
    {
    m_value = convert(str, &m_base, ok);
    -};
    +}


    QString KSimBaseUInt::text() const
    diff -urN ../tmp-orig/ksimus-0.3.6-2/ksimus/tools/ksimbooltristate.cpp ./ksimus/tools/ksimbooltristate.cpp
    --- ../tmp-orig/ksimus-0.3.6-2/