summaryrefslogtreecommitdiffstats
path: root/src/modules/options/libkvioptions.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-28 18:31:12 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-28 18:31:12 +0000
commit0a80cfd57d271dd44221467efb426675fa470356 (patch)
tree6f503a31aa078eaf8fa015cf1749808529d49fc9 /src/modules/options/libkvioptions.cpp
parent3329e5a804e28ef3f5eb51d1e7affdd5a508e8f2 (diff)
downloadkvirc-0a80cfd57d271dd44221467efb426675fa470356.tar.gz
kvirc-0a80cfd57d271dd44221467efb426675fa470356.zip
TQt4 port kvirc
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/modules/options/libkvioptions.cpp')
-rw-r--r--src/modules/options/libkvioptions.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 175b61ff..38593666 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -37,11 +37,11 @@
#include "dialog.h"
-#include <qsplitter.h>
+#include <tqsplitter.h>
#include "kvi_pointerhashtable.h"
-KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
KviOptionsInstanceManager * g_pOptionsInstanceManager = 0;
@@ -93,24 +93,24 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall * c)
static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
{
- QString szGroup;
+ TQString szGroup;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
KVSM_PARAMETERS_END(c)
if(szGroup.isEmpty())szGroup = "general";
- KviOptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
+ KviOptionsDialog * d = g_pOptionsDialogDict->tqfind(szGroup);
if(d)
{
if(c->hasSwitch('t',"toplevel"))
{
- if(d->parent())
+ if(d->tqparent())
{
- d->reparent(0,QPoint(0,0),true);
+ d->reparent(0,TQPoint(0,0),true);
}
} else {
- if(d->parent() != c->window()->frame()->splitter())
+ if(TQT_BASE_OBJECT(d->tqparent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
{
- d->reparent(c->window()->frame()->splitter(),QPoint(0,0),true);
+ d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
}
}
} else {
@@ -189,7 +189,7 @@ static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
{
- QString szOption;
+ TQString szOption;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption)
KVSM_PARAMETERS_END(c)
@@ -209,11 +209,11 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
return true;
}
- QWidget * w;
+ TQWidget * w;
if(c->hasSwitch('m',"modal"))
{
- w = g_pApp->activeModalWidget();
+ w = TQT_TQWIDGET(g_pApp->activeModalWidget());
if(!w)w = g_pFrame;
} else {
w = g_pFrame;
@@ -223,12 +223,12 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
wc->setup(g_pOptionsInstanceManager->getInstance(e,wc));
- // a trick for the dialog covering the splash screen before the time (this is prolly a WM or Qt bug)
+ // a trick for the dialog covering the splash screen before the time (this is prolly a WM or TQt bug)
if(g_pSplashScreen)
{
if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click...
{
- QObject::connect(g_pSplashScreen,SIGNAL(destroyed()),wc,SLOT(show()));
+ TQObject::connect(g_pSplashScreen,TQT_SIGNAL(destroyed()),wc,TQT_SLOT(show()));
return true;
}
}
@@ -259,12 +259,12 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
{
- QString szGroup;
+ TQString szGroup;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
KVSM_PARAMETERS_END(c)
if(szGroup.isEmpty())szGroup = "general";
- c->returnValue()->setBoolean(g_pOptionsDialogDict->find(szGroup));
+ c->returnValue()->setBoolean(g_pOptionsDialogDict->tqfind(szGroup));
return true;
}
@@ -279,7 +279,7 @@ static bool options_module_init(KviModule * m)
KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit);
KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog);
- g_pOptionsDialogDict = new KviPointerHashTable<QString,KviOptionsDialog>;
+ g_pOptionsDialogDict = new KviPointerHashTable<TQString,KviOptionsDialog>;
g_pOptionsDialogDict->setAutoDelete(false);
return true;
@@ -287,7 +287,7 @@ static bool options_module_init(KviModule * m)
static bool options_module_cleanup(KviModule *m)
{
- KviPointerHashTableIterator<QString,KviOptionsDialog> it(*g_pOptionsDialogDict);
+ KviPointerHashTableIterator<TQString,KviOptionsDialog> it(*g_pOptionsDialogDict);
KviPointerList<KviOptionsDialog> l;
l.setAutoDelete(false);
KviOptionsDialog * d;