aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Alexey Uzhva2007-03-03 10:32:51 +0000
committerGravatar Alexey Uzhva2007-03-03 10:32:51 +0000
commit95fe45b65b6494e9e21bb98ca027c783dcd3681b (patch)
treed9996372688324e74f8b3b3dae4fd27959645f42 /src
parentsome fix (diff)
downloadKVIrc-95fe45b65b6494e9e21bb98ca027c783dcd3681b.tar.gz
KVIrc-95fe45b65b6494e9e21bb98ca027c783dcd3681b.tar.bz2
KVIrc-95fe45b65b6494e9e21bb98ca027c783dcd3681b.zip
quick fix
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@405 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kernel/kvi_options.cpp2
-rw-r--r--src/kvirc/ui/kvi_maskeditor.cpp5
-rw-r--r--src/kvirc/ui/kvi_maskeditor.h5
3 files changed, 9 insertions, 3 deletions
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 0c65e1f3f..61c837517 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -303,7 +303,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("DrawGenderIcons",true,KviOption_sectFlagFrame | KviOption_resetUpdateGui | KviOption_groupTheme),
BOOL_OPTION("PrependGenderInfoToRealname",true,KviOption_sectFlagConnection),
BOOL_OPTION("UseIdentServiceOnlyOnConnect",true,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
- BOOL_OPTION("UseSystemUrlHandlers ",true,KviOption_sectFlagUrl)
+ BOOL_OPTION("UseSystemUrlHandlers",true,KviOption_sectFlagUrl)
};
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 6bfa0e8ac..9ab321924 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -49,8 +49,11 @@ KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry)
KviMaskItem::~KviMaskItem()
{
}
-
+#ifdef COMPILE_QT4_SUPPORT
int KviMaskItem::compare ( KviTalListViewItem * i, int col, bool ascending ) const
+#else
+int KviMaskItem::compare ( QListViewItem * i, int col, bool ascending ) const
+#endif
{
if(col==2)
{
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index f974e27dc..f74ccbfaf 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -51,8 +51,11 @@ public:
~KviMaskItem();
KviMaskEntry* mask() { return &m_Mask; };
-
+#ifdef COMPILE_QT4_SUPPORT
virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const;
+#else
+ virtual int compare ( QListViewItem * i, int col, bool ascending ) const;
+#endif
protected:
KviMaskEntry m_Mask;