diff options
| author |  Szymon Tomasz Stefanek | 2008-01-16 13:47:18 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-01-16 13:47:18 +0000 |
| commit | 74f28ff4c6f7ea0687c2633007f98875ef8b5d30 (patch) | |
| tree | 58f56c1aa95e09b7c46152487210c4bd1e14a58b /src/modules/objects/class_mainwindow.cpp | |
| parent | update (diff) | |
| download | KVIrc-74f28ff4c6f7ea0687c2633007f98875ef8b5d30.tar.gz KVIrc-74f28ff4c6f7ea0687c2633007f98875ef8b5d30.tar.bz2 KVIrc-74f28ff4c6f7ea0687c2633007f98875ef8b5d30.zip | |
Selectively backporting Alexey's qmake branch work into trunk: no longer depending on Q3MainWindow, Q3ToolBar, Q3DockWindow etc...
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1092 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects/class_mainwindow.cpp')
| -rw-r--r-- | src/modules/objects/class_mainwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 90f91731c..7a215f7ba 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -108,6 +108,7 @@ bool KviKvsObject_mainwindow::functionsetDockEnabled(KviKvsObjectFunctionCall *c KVSO_PARAMETERS_END(c) if(widget()) { +#ifndef COMPILE_USE_QT4 if(KviQString::equalCI(szDockarea,"Top")) ((KviTalMainWindow *)widget())->setDockEnabled(Qt::DockTop,bFlag); else if(KviQString::equalCI(szDockarea,"Left")) @@ -123,6 +124,7 @@ bool KviKvsObject_mainwindow::functionsetDockEnabled(KviKvsObjectFunctionCall *c else if(KviQString::equalCI(szDockarea,"Unmanaged")) ((KviTalMainWindow *)widget())->setDockEnabled(Qt::DockUnmanaged,bFlag); else c->warning(__tr2qs("Unknown dock area '%Q'"),&szDockarea); +#endif } return true; @@ -131,11 +133,12 @@ bool KviKvsObject_mainwindow::functionisDockEnabled(KviKvsObjectFunctionCall *c) { QString szDockarea; - bool bFlag; + bool bFlag = false; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("dock_area",KVS_PT_STRING,0,szDockarea) KVSO_PARAMETERS_END(c) if(!widget()) return true; +#ifndef COMPILE_USE_QT4 if(KviQString::equalCI(szDockarea,"Top")) bFlag=((KviTalMainWindow *)widget())->isDockEnabled(Qt::DockTop); else if(KviQString::equalCI(szDockarea,"Left")) bFlag=((KviTalMainWindow *)widget())->isDockEnabled(Qt::DockLeft); else if(KviQString::equalCI(szDockarea,"Right")) bFlag=((KviTalMainWindow *)widget())->isDockEnabled(Qt::DockRight); @@ -148,6 +151,7 @@ bool KviKvsObject_mainwindow::functionisDockEnabled(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Unknown dock area '%Q'"),&szDockarea); return true; } +#endif c->returnValue()->setBoolean(bFlag); return true; |