diff options
| author | 2009-08-16 05:16:34 +0000 | |
|---|---|---|
| committer | 2009-08-16 05:16:34 +0000 | |
| commit | 67860dda63870857df0cc4287930287b8e07a1c2 (patch) | |
| tree | bb255381e62821bf47d838fa7006babfcc8d8fe0 /src/modules | |
| parent | ascending order set as default in logviewer (#523) (diff) | |
| download | KVIrc-67860dda63870857df0cc4287930287b8e07a1c2.tar.gz KVIrc-67860dda63870857df0cc4287930287b8e07a1c2.tar.bz2 KVIrc-67860dda63870857df0cc4287930287b8e07a1c2.zip | |
-pedantic compilation patch (fix for #526). Thanks to toma.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3413 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/addon/addonfunctions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/addon/addonfunctions.h | 2 | ||||
| -rw-r--r-- | src/modules/logview/logviewwidget.cpp | 6 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mprisinterface.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_pixmap.h | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_sql.cpp | 6 | ||||
| -rw-r--r-- | src/modules/raweditor/raweditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/theme/themefunctions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/theme/themefunctions.h | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp index b1e402d06..c4dd7822a 100644 --- a/src/modules/addon/addonfunctions.cpp +++ b/src/modules/addon/addonfunctions.cpp @@ -337,4 +337,4 @@ namespace KviAddonFunctions return szDirName; } -}; +} diff --git a/src/modules/addon/addonfunctions.h b/src/modules/addon/addonfunctions.h index b050341ff..47f49813d 100644 --- a/src/modules/addon/addonfunctions.h +++ b/src/modules/addon/addonfunctions.h @@ -47,7 +47,7 @@ namespace KviAddonFunctions const QString &szAddonAddonEngineVersion ); QString createRandomDir(); -}; +} #endif //!_ADDONFUNCTIONS_H_ diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index 74131185c..462f764be 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -44,19 +44,19 @@ KviLogListViewItem::KviLogListViewItem(KviTalTreeWidgetItem * par, KviLogFile::K : KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData) { setText(0,m_pFileData ? m_pFileData->name() : QString()); -}; +} KviLogListViewItem::KviLogListViewItem(KviTalTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData) : KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData) { setText(0,m_pFileData ? m_pFileData->name() : QString()); -}; +} KviLogListViewItemFolder::KviLogListViewItemFolder(KviTalTreeWidgetItem * par, const QString& label) : KviLogListViewItem(par,KviLogFile::Other,0) { setText(0,label); -}; +} KviLogListViewItemType::KviLogListViewItemType(KviTalTreeWidget * par, KviLogFile::KviLogTypes type) : KviLogListViewItem(par,type,0) diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp index 89528c52e..1c6752c8d 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.cpp +++ b/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -50,7 +50,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const MPRISPlayerStatus &stat argument << status.Play << status.Random << status.RepeatCurrent << status.RepeatPlaylist; argument.endStructure(); return argument; -}; +} const QDBusArgument &operator>>(const QDBusArgument &argument, MPRISPlayerStatus &status) { @@ -58,7 +58,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, MPRISPlayerStatus argument >> status.Play >> status.Random >> status.RepeatCurrent >> status.RepeatPlaylist; argument.endStructure(); return argument; -}; +} KviMPRISInterface::KviMPRISInterface() : KviMediaPlayerInterface() diff --git a/src/modules/objects/class_pixmap.h b/src/modules/objects/class_pixmap.h index 7689ab59b..485f32e5b 100644 --- a/src/modules/objects/class_pixmap.h +++ b/src/modules/objects/class_pixmap.h @@ -42,7 +42,7 @@ class KviKvsObject_pixmap : public KviKvsObject Q_OBJECT // Q_PROPERTY(QPixmap pixmap READ getPixmap) public: - KVSO_DECLARE_OBJECT(KviKvsObject_pixmap); + KVSO_DECLARE_OBJECT(KviKvsObject_pixmap) QPixmap * getPixmap(); //QPixmap * pixmap(){ return m_pPixmap; } diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/class_sql.cpp index ec8e3a4ef..cfaa7ebe0 100644 --- a/src/modules/objects/class_sql.cpp +++ b/src/modules/objects/class_sql.cpp @@ -48,17 +48,17 @@ static bool checkDuplicatedConnection(QString &szConnectionName) } } return bFound; -}; +} static void KviKvsSqlInstanceRegister(KviKvsObject_sql *instance) { sql_instances.setAutoDelete(false); sql_instances.append(instance); -}; +} static void KviKvsSqlInstanceUnregister(KviKvsObject_sql *instance) { int idx=sql_instances.findRef(instance); sql_instances.remove(idx); -}; +} #define CHECK_QUERY_IS_INIT if (!m_pCurrentSQlQuery)\ {\ diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index 5efe02d1e..bae1cd11a 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -61,7 +61,7 @@ KviRawTreeWidgetItem::KviRawTreeWidgetItem(KviTalTreeWidget *par,int idx,bool bE if(idx < 10)m_szName.prepend('0'); setText(0,m_szName); setEnabled(bEnabled); -}; +} /* const QPixmap * KviRawTreeWidgetItem::pixmap(int col) const { diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp index 8b4d3beb9..446d6797c 100644 --- a/src/modules/theme/themefunctions.cpp +++ b/src/modules/theme/themefunctions.cpp @@ -391,5 +391,5 @@ namespace KviThemeFunctions g_pFrame->showNormal(); return bResult; } -}; +} diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h index 72ecd36f8..f7b357e5b 100644 --- a/src/modules/theme/themefunctions.h +++ b/src/modules/theme/themefunctions.h @@ -50,7 +50,7 @@ namespace KviThemeFunctions ); bool makeKVIrcScreenshot(const QString &szSavePngFilePath,bool bMaximizeFrame = false); -}; +} |
