From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: 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 --- src/kvirc/ui/kvi_frame.cpp | 383 ++++++++++++++++++++------------------------- 1 file changed, 173 insertions(+), 210 deletions(-) (limited to 'src/kvirc/ui/kvi_frame.cpp') diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index e7b7c0b..6b6db20 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -60,42 +60,40 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include -#include -#include -#include -#include - -#include -#include - -#if QT_VERSION >= 300 - #include - #include - #ifdef COMPILE_USE_QT4 - #include - #define QDockArea Q3DockArea - #else - #include - #endif +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#ifdef COMPILE_USE_QT4 + #include + #define TQDockArea Q3DockArea +#else + #include #endif #ifdef COMPILE_USE_QT4 - #include - #include - #include + #include + #include + #include #else - #include + #include #endif #include #ifdef COMPILE_PSEUDO_TRANSPARENCY - #include + #include // kvi_app.h - extern QPixmap * g_pShadedParentGlobalDesktopBackground; - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedParentGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; // FIXME: #warning "When a toolbar is moved , MdiManager is resized but does not update the MdiChild backgrounds" #endif @@ -120,16 +118,16 @@ KviFrame::KviFrame() m_pDockExtension = 0; - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); -// m_pSplitter->setFrameShape(QFrame::NoFrame); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); +// m_pSplitter->setFrameShape(TQFrame::NoFrame); setCentralWidget(m_pSplitter); setUsesBigPixmaps(KVI_OPTION_BOOL(KviOption_boolUseBigIcons)); m_pMdi = new KviMdiManager(m_pSplitter,this,"mdi_manager"); - connect(m_pMdi,SIGNAL(enteredSdiMode()),this,SLOT(enteredSdiMode())); - connect(m_pMdi,SIGNAL(leftSdiMode()),this,SLOT(leftSdiMode())); + connect(m_pMdi,TQT_SIGNAL(enteredSdiMode()),this,TQT_SLOT(enteredSdiMode())); + connect(m_pMdi,TQT_SIGNAL(leftSdiMode()),this,TQT_SLOT(leftSdiMode())); // This theoretically had to exists before KviMdiManager (that uses enterSdiMode) m_pMenuBar = new KviMenuBar(this,"main_menu_bar"); @@ -160,7 +158,7 @@ KviFrame::KviFrame() if((KVI_OPTION_RECT(KviOption_rectFrameGeometry).width() < 100) || (KVI_OPTION_RECT(KviOption_rectFrameGeometry).height() < 100)) { // Try to find some reasonable defaults - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(10,10,g_pApp->desktop()->width() - 200,g_pApp->desktop()->height() - 150); + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(10,10,g_pApp->desktop()->width() - 200,g_pApp->desktop()->height() - 150); } resize(KVI_OPTION_RECT(KviOption_rectFrameGeometry).width(), @@ -175,12 +173,12 @@ KviFrame::KviFrame() installAccelerators(this); - layout()->setResizeMode(QLayout::FreeResize); + tqlayout()->setResizeMode(TQLayout::FreeResize); } KviFrame::~KviFrame() { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); KVI_OPTION_BOOL(KviOption_boolUseBigIcons) = usesBigPixmaps(); @@ -222,7 +220,7 @@ KviFrame::~KviFrame() g_pFrame = 0; } -int KviFrame::registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot) +int KviFrame::registerAccelerator(const TQString &szKeySequence,TQObject * recv,const char * slot) { int id = m_pAccel->insertItem(szKeySequence); m_pAccel->connectItem(id,recv,slot); @@ -246,13 +244,13 @@ void KviFrame::unregisterModuleExtensionToolBar(KviMexToolBar * t) void KviFrame::restoreModuleExtensionToolBars() { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) { - QString szEntry = *it; - int idx = szEntry.find(':'); + TQString szEntry = *it; + int idx = szEntry.tqfind(':'); if(idx != -1) { - QString szMod = szEntry.left(idx); + TQString szMod = szEntry.left(idx); szEntry.remove(0,idx + 1); g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod); } @@ -265,7 +263,7 @@ void KviFrame::saveModuleExtensionToolBars() for(KviMexToolBar * t = m_pModuleExtensionToolBarList->first();t;t = m_pModuleExtensionToolBarList->next()) { - QString s = t->descriptor()->module()->name(); + TQString s = t->descriptor()->module()->name(); s += ":"; s += t->descriptor()->name().ptr(); @@ -311,7 +309,7 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) [b]Tab after a leading /[/b]: Completes commands[br] [b]Tab after a / in the middle of input[/b]: Completes directories[br] [b]Tab after a $[/b]: Completes function names[br] - [b]Shift+Tab after the first word of input[/b]: completes masks in the current channel or query[br] + [b]Shift+Tab after the first word of input[/b]: completes tqmasks in the current channel or query[br] [b]Ctrl+B[/b]: Inserts the 'bold' mIRC text control character[br] [b]Ctrl+K[/b]: Inserts the 'color' mIRC text control character[br] [b]Ctrl+R[/b]: Inserts the 'reverse' mIRC text control character[br] @@ -345,63 +343,63 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) */ -KviAccel * KviFrame::installAccelerators(QWidget * wnd) +KviAccel * KviFrame::installAccelerators(TQWidget * wnd) { - QWidget * pParent = wnd ? (QWidget *)wnd : (QWidget *)this; + TQWidget * pParent = wnd ? (TQWidget *)wnd : (TQWidget *)this; #ifdef COMPILE_USE_QT4 - new QShortcut(QKeySequence(Qt::Key_Left + Qt::ALT),pParent,SLOT(switchToPrevWindow())); - new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT),pParent,SLOT(switchToNextWindow())); - new QShortcut(QKeySequence(Qt::Key_Up + Qt::CTRL),pParent,SLOT(maximizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Down + Qt::CTRL),pParent,SLOT(minimizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Escape +Qt::CTRL),pParent,SLOT(minimizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Left + Qt::ALT + Qt::SHIFT),pParent,SLOT(switchToPrevWindowInContext())); - new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT + Qt::SHIFT),pParent,SLOT(switchToNextWindowInContext())); + new TQShortcut(TQKeySequence(TQt::Key_Left + TQt::ALT),pParent,TQT_SLOT(switchToPrevWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Right + TQt::ALT),pParent,TQT_SLOT(switchToNextWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Up + TQt::CTRL),pParent,TQT_SLOT(maximizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Down + TQt::CTRL),pParent,TQT_SLOT(minimizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Escape +TQt::CTRL),pParent,TQT_SLOT(minimizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Left + TQt::ALT + TQt::SHIFT),pParent,TQT_SLOT(switchToPrevWindowInContext())); + new TQShortcut(TQKeySequence(TQt::Key_Right + TQt::ALT + TQt::SHIFT),pParent,TQT_SLOT(switchToNextWindowInContext())); #endif KviAccel *ac = new KviAccel(pParent); static int accel_table[] = { - Qt::Key_Left + Qt::ALT , // prev window - Qt::Key_Right + Qt::ALT , // next window - Qt::Key_Up + Qt::CTRL , // maximize window - Qt::Key_Down + Qt::CTRL , // minimize window - Qt::Key_Escape +Qt::CTRL, // minimize window - Qt::Key_Left + Qt::ALT + Qt::SHIFT , // prev window in context - Qt::Key_Right + Qt::ALT + Qt::SHIFT, // next window in context - Qt::Key_F4 + Qt::CTRL , // close current window - Qt::Key_1 + Qt::CTRL , // script accels... - Qt::Key_2 + Qt::CTRL , - Qt::Key_3 + Qt::CTRL , - Qt::Key_4 + Qt::CTRL , - Qt::Key_5 + Qt::CTRL , - Qt::Key_6 + Qt::CTRL , - Qt::Key_7 + Qt::CTRL , - Qt::Key_8 + Qt::CTRL , - Qt::Key_9 + Qt::CTRL , - Qt::Key_0 + Qt::CTRL , - Qt::Key_F1 , // reserved for context sensitive help - Qt::Key_F2 , - Qt::Key_F3 , - Qt::Key_F4 , - Qt::Key_F5 , - Qt::Key_F6 , - Qt::Key_F7 , - Qt::Key_F8 , - Qt::Key_F9 , - Qt::Key_F10 , - Qt::Key_F11 , - Qt::Key_F12 , -/* Qt::Key_F1 + Qt::SHIFT , // window select... - Qt::Key_F2 + Qt::SHIFT , - Qt::Key_F3 + Qt::SHIFT , - Qt::Key_F4 + Qt::SHIFT , - Qt::Key_F5 + Qt::SHIFT , - Qt::Key_F6 + Qt::SHIFT , - Qt::Key_F7 + Qt::SHIFT , - Qt::Key_F8 + Qt::SHIFT , - Qt::Key_F9 + Qt::SHIFT , - Qt::Key_F10 + Qt::SHIFT , - Qt::Key_F11 + Qt::SHIFT , - Qt::Key_F12 + Qt::SHIFT ,*/ + TQt::Key_Left + TQt::ALT , // prev window + TQt::Key_Right + TQt::ALT , // next window + TQt::Key_Up + TQt::CTRL , // maximize window + TQt::Key_Down + TQt::CTRL , // minimize window + TQt::Key_Escape +TQt::CTRL, // minimize window + TQt::Key_Left + TQt::ALT + TQt::SHIFT , // prev window in context + TQt::Key_Right + TQt::ALT + TQt::SHIFT, // next window in context + TQt::Key_F4 + TQt::CTRL , // close current window + TQt::Key_1 + TQt::CTRL , // script accels... + TQt::Key_2 + TQt::CTRL , + TQt::Key_3 + TQt::CTRL , + TQt::Key_4 + TQt::CTRL , + TQt::Key_5 + TQt::CTRL , + TQt::Key_6 + TQt::CTRL , + TQt::Key_7 + TQt::CTRL , + TQt::Key_8 + TQt::CTRL , + TQt::Key_9 + TQt::CTRL , + TQt::Key_0 + TQt::CTRL , + TQt::Key_F1 , // reserved for context sensitive help + TQt::Key_F2 , + TQt::Key_F3 , + TQt::Key_F4 , + TQt::Key_F5 , + TQt::Key_F6 , + TQt::Key_F7 , + TQt::Key_F8 , + TQt::Key_F9 , + TQt::Key_F10 , + TQt::Key_F11 , + TQt::Key_F12 , +/* TQt::Key_F1 + TQt::SHIFT , // window select... + TQt::Key_F2 + TQt::SHIFT , + TQt::Key_F3 + TQt::SHIFT , + TQt::Key_F4 + TQt::SHIFT , + TQt::Key_F5 + TQt::SHIFT , + TQt::Key_F6 + TQt::SHIFT , + TQt::Key_F7 + TQt::SHIFT , + TQt::Key_F8 + TQt::SHIFT , + TQt::Key_F9 + TQt::SHIFT , + TQt::Key_F10 + TQt::SHIFT , + TQt::Key_F11 + TQt::SHIFT , + TQt::Key_F12 + TQt::SHIFT ,*/ 0 }; @@ -413,79 +411,79 @@ KviAccel * KviFrame::installAccelerators(QWidget * wnd) i++; } - connect(ac,SIGNAL(activated(int)),this,SLOT(accelActivated(int))); + connect(ac,TQT_SIGNAL(activated(int)),this,TQT_SLOT(accelActivated(int))); return ac; } void KviFrame::accelActivated(int id) { - KviAccel * acc = (KviAccel *)sender(); + KviAccel * acc = (KviAccel *)TQT_TQOBJECT(const_cast(sender())); int keys = (int)(acc->key(id)); KviTaskBarItem *item = 0; debug("accel"); switch(keys) { - case (Qt::Key_Left+Qt::ALT): switchToPrevWindow(); break; - case (Qt::Key_Right+Qt::ALT): switchToNextWindow(); break; - case (Qt::Key_Up+Qt::CTRL): maximizeWindow(); break; - case (Qt::Key_Escape+Qt::CTRL): - case (Qt::Key_Down+Qt::CTRL): minimizeWindow(); break; - case (Qt::Key_Left+Qt::ALT+Qt::SHIFT): switchToPrevWindowInContext(); break; - case (Qt::Key_Right+Qt::ALT+Qt::SHIFT): switchToNextWindowInContext(); break; - case (Qt::Key_F4+Qt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; - case (Qt::Key_F1): g_pApp->contextSensitiveHelp(); break; -/* case(Qt::Key_F1 + SHIFT): + case (TQt::Key_Left+TQt::ALT): switchToPrevWindow(); break; + case (TQt::Key_Right+TQt::ALT): switchToNextWindow(); break; + case (TQt::Key_Up+TQt::CTRL): maximizeWindow(); break; + case (TQt::Key_Escape+TQt::CTRL): + case (TQt::Key_Down+TQt::CTRL): minimizeWindow(); break; + case (TQt::Key_Left+TQt::ALT+TQt::SHIFT): switchToPrevWindowInContext(); break; + case (TQt::Key_Right+TQt::ALT+TQt::SHIFT): switchToNextWindowInContext(); break; + case (TQt::Key_F4+TQt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; + case (TQt::Key_F1): g_pApp->contextSensitiveHelp(); break; +/* case(TQt::Key_F1 + SHIFT): item = m_pTaskBar->item(0); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F2 + SHIFT): + case(TQt::Key_F2 + SHIFT): item = m_pTaskBar->item(1); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F3 + SHIFT): + case(TQt::Key_F3 + SHIFT): item = m_pTaskBar->item(2); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F4 + SHIFT): + case(TQt::Key_F4 + SHIFT): item = m_pTaskBar->item(3); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F5 + SHIFT): + case(TQt::Key_F5 + SHIFT): item = m_pTaskBar->item(4); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F6 + SHIFT): + case(TQt::Key_F6 + SHIFT): item = m_pTaskBar->item(5); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F7 + SHIFT): + case(TQt::Key_F7 + SHIFT): item = m_pTaskBar->item(6); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F8 + SHIFT): + case(TQt::Key_F8 + SHIFT): item = m_pTaskBar->item(7); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F9 + SHIFT): + case(TQt::Key_F9 + SHIFT): item = m_pTaskBar->item(8); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F10 + SHIFT): + case(TQt::Key_F10 + SHIFT): item = m_pTaskBar->item(9); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F11 + SHIFT): + case(TQt::Key_F11 + SHIFT): item = m_pTaskBar->item(10); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F12 + SHIFT): + case(TQt::Key_F12 + SHIFT): item = m_pTaskBar->item(11); if(item) setActiveWindow(item->window()); break;*/ default: { - KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(acc->key(id))); + KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(TQString)(acc->key(id))); } break; }; @@ -511,7 +509,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection) unsigned int minVal = time(0); while(it.current() && minVal) { - QString * pVal = it.current()->find("EntryTimestamp"); + TQString * pVal = it.current()->tqfind("EntryTimestamp"); if(pVal) { bool bOk; @@ -560,7 +558,7 @@ void KviFrame::closeWindow(KviWindow *wnd) // save it's properties if(KVI_OPTION_BOOL(KviOption_boolWindowsRememberProperties)) // && (wnd->type() == KVI_WINDOW_TYPE_CHANNEL)) { - QString group; + TQString group; wnd->getConfigGroupName(group); // not uses default settings : store it always saveWindowProperties(wnd,group); @@ -617,7 +615,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow) m_pWinList->append(wnd); wnd->createTaskBarItem(); // create the window taskbar item AFTER it has been constructed - QString group; + TQString group; wnd->getConfigGroupName(group); bool bGroupSettings = false; @@ -652,7 +650,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow) //KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode) = false; } else bMaximized = false; - QRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",QRect(10,10,500,380)); + TQRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",TQRect(10,10,500,380)); if(bDocked) { @@ -713,7 +711,7 @@ docking_done: } } -KviMdiChild * KviFrame::dockWindow(KviWindow *wnd,bool bShow,bool bCascade,QRect *setGeom) +KviMdiChild * KviFrame::dockWindow(KviWindow *wnd,bool bShow,bool bCascade,TQRect *setGeom) { if(wnd->mdiParent())return wnd->mdiParent(); KviMdiChild * lpC = new KviMdiChild(m_pMdi,""); @@ -807,7 +805,7 @@ void KviFrame::unhighlightWindowsOfContext(KviIrcContext * c) void KviFrame::setActiveWindow(KviWindow *wnd) { - // ASSERT(m_pWinList->findRef(wnd)) + // ASSERT(m_pWinList->tqfindRef(wnd)) if(wnd->isMinimized())wnd->restore(); if(wnd->mdiParent())wnd->setFocus(); else wnd->delayedAutoRaise(); @@ -869,7 +867,7 @@ void KviFrame::childConnectionUserModeChange(KviIrcConnection * c) void KviFrame::childWindowActivated(KviWindow *wnd) { - // ASSERT(m_pWinList->findRef(wnd)) + // ASSERT(m_pWinList->tqfindRef(wnd)) if(g_pActiveWindow == wnd)return; if(g_pActiveWindow)g_pActiveWindow->lostUserFocus(); // YES: it's HERE! @@ -881,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd) if(wnd->isMaximized() && wnd->mdiParent())updateCaption(); m_pTaskBar->setActiveItem(wnd->taskBarItem()); - //wnd->gainedActiveWindowStatus(); // <-- atm unused + //wnd->gainedActiveWindowtqStatus(); // <-- atm unused if(g_pActiveWindow->view()) g_pActiveWindow->view()->clearUnreaded(); @@ -934,8 +932,8 @@ void KviFrame::updateCaption() { if(g_pActiveWindow->isMaximized() && g_pActiveWindow->mdiParent()) { - QString tmp = g_pActiveWindow->plainTextCaption(); - tmp += QChar(' '); + TQString tmp = g_pActiveWindow->plainTextCaption(); + tmp += TQChar(' '); tmp += KVI_DEFAULT_FRAME_CAPTION; setCaption(tmp); return; @@ -945,7 +943,7 @@ void KviFrame::updateCaption() } -void KviFrame::closeEvent(QCloseEvent *e) +void KviFrame::closeEvent(TQCloseEvent *e) { if(KVI_OPTION_BOOL(KviOption_boolCloseInTray)) @@ -960,7 +958,7 @@ void KviFrame::closeEvent(QCloseEvent *e) { dockExtension()->setPrevWindowState(windowState()); - QTimer::singleShot( 0, this, SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } return; } @@ -984,12 +982,12 @@ void KviFrame::closeEvent(QCloseEvent *e) if(bGotRunningConnection) { - QString txt = "

"; + TQString txt = "

"; txt += __tr2qs("There are active connections, are you sure you wish to "); txt += __tr2qs("quit KVIrc?"); txt += "

"; - switch(QMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) + switch(TQMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) { case 0: // ok to close @@ -1012,9 +1010,9 @@ void KviFrame::closeEvent(QCloseEvent *e) g_pApp->destroyFrame(); } -void KviFrame::resizeEvent(QResizeEvent *e) +void KviFrame::resizeEvent(TQResizeEvent *e) { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); KviTalMainWindow::resizeEvent(e); } @@ -1032,9 +1030,9 @@ void KviFrame::updatePseudoTransparency() #endif } -void KviFrame::moveEvent(QMoveEvent *e) +void KviFrame::moveEvent(TQMoveEvent *e) { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); #ifdef COMPILE_PSEUDO_TRANSPARENCY updatePseudoTransparency(); @@ -1076,8 +1074,8 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { p->clear(); - disconnect(p,SIGNAL(activated(int)),this,SLOT(toolbarsPopupSelected(int))); // just to be sure - connect(p,SIGNAL(activated(int)),this,SLOT(toolbarsPopupSelected(int))); + disconnect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); // just to be sure + connect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); int id; int cnt = 0; @@ -1087,7 +1085,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) { - QString label = __tr2qs("Show %1").arg(d->visibleName()); + TQString label = __tr2qs("Show %1").tqarg(d->visibleName()); if(d->icon())id = p->insertItem(*(d->icon()),label); else id = p->insertItem(label); p->setItemChecked(id,moduleExtensionToolBar(d->id())); @@ -1097,14 +1095,14 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } // FIXME: Should this display "Hide %1" when the toolbar is already visible ? - KviPointerHashTableIterator it2(*(KviCustomToolBarManager::instance()->descriptors())); + KviPointerHashTableIterator it2(*(KviCustomToolBarManager::instance()->descriptors())); if(it2.current()) { if(cnt > 0)p->insertSeparator(); while(KviCustomToolBarDescriptor * d = it2.current()) { - QString label = __tr2qs("Show %1").arg(d->label()); - QString ico = d->iconId(); + TQString label = __tr2qs("Show %1").tqarg(d->label()); + TQString ico = d->iconId(); // use the icon only if there is no check if(d->toolBar()) { @@ -1113,7 +1111,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } else { if(!ico.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(d->iconId()); + TQPixmap * pix = g_pIconManager->getImage(d->iconId()); if(pix) { id = p->insertItem(*pix,label); @@ -1131,7 +1129,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } if(cnt > 0)p->insertSeparator(); - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,SLOT(customizeToolBars())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,TQT_SLOT(customizeToolBars())); } void KviFrame::customizeToolBars() @@ -1141,7 +1139,7 @@ void KviFrame::customizeToolBars() void KviFrame::toolbarsPopupSelected(int id) { - const QObject * o = sender(); + const TQObject * o = TQT_TQOBJECT(const_cast(sender())); if(!o)return; if(!o->inherits("KviTalPopupMenu"))return; const KviTalPopupMenu * p = (const KviTalPopupMenu *)o; @@ -1167,20 +1165,20 @@ void KviFrame::toolbarsPopupSelected(int id) bool KviFrame::focusNextPrevChild(bool next) { //debug("FOCUS NEXT PREV CHILD"); - QWidget * w = focusWidget(); + TQWidget * w = tqfocusWidget(); if(w) { #ifdef COMPILE_USE_QT4 - if(w->focusPolicy() == Qt::StrongFocus)return false; + if(w->focusPolicy() == TTQ_StrongFocus)return false; #else - if(w->focusPolicy() == QWidget::StrongFocus)return false; + if(w->focusPolicy() == TQ_StrongFocus)return false; #endif - //QVariant v = w->property("KviProperty_FocusOwner"); + //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->parent()) + if(w->tqparent()) { - QVariant v = w->parent()->property("KviProperty_ChildFocusOwner"); + TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner"); if(v.isValid())return false; // Do NOT change the focus widget! } } @@ -1200,16 +1198,16 @@ bool KviFrame::focusNextPrevChild(bool next) void KviFrame::saveToolBarPositions() { - QString szTemp; + TQString szTemp; g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); - QFile f(szTemp); + TQFile f(szTemp); if(f.open(IO_WriteOnly | IO_Truncate)) { #ifdef COMPILE_USE_QT4 f.write(saveState(1)); #else //!COMPILE_USE_QT4 - QTextStream ts(&f); + TQTextStream ts(&f); ts << *this; f.close(); #endif //!COMPILE_USE_QT4 @@ -1218,10 +1216,10 @@ void KviFrame::saveToolBarPositions() void KviFrame::restoreToolBarPositions() { - QString szTemp; + TQString szTemp; g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); - QFile f(szTemp); + TQFile f(szTemp); bool bNeedDefaults = false; @@ -1231,7 +1229,7 @@ void KviFrame::restoreToolBarPositions() if(!restoreState(f.readAll(),1)) debug("Error while restoring toolbars position"); #else //!COMPILE_USE_QT4 - QTextStream ts(&f); + TQTextStream ts(&f); ts >> *this; f.close(); #endif //!COMPILE_USE_QT4 @@ -1247,7 +1245,7 @@ void KviFrame::restoreToolBarPositions() if(m_pTaskBar->width() > 600) m_pTaskBar->setFixedWidth(250); #else //!COMPILE_USE_QT4 - QDockArea * a = m_pTaskBar->area(); + TQDockArea * a = m_pTaskBar->area(); if((a == topDock()) || (a == bottomDock())) { // nope.... need to move it @@ -1256,7 +1254,7 @@ void KviFrame::restoreToolBarPositions() //int iMaxWidth = m_pTaskBar->maximumWidth(); leftDock()->moveDockWindow(m_pTaskBar); //m_pTaskBar->setMaximumWidth(iMaxWidth); - //m_pTaskBar->setOrientation(Vertical); + //m_pTaskBar->setOrientationQt::Vertical); } // ensure that it is not too wide if(m_pTaskBar->width() > 600) @@ -1264,7 +1262,7 @@ void KviFrame::restoreToolBarPositions() #endif //!COMPILE_USE_QT4 } /*else if(m_pTaskBar->inherits("KviClassicTaskBar")) { - QDockArea * a = m_pTaskBar->area(); + TQDockArea * a = m_pTaskBar->area(); if((a == leftDock()) || (a == rightDock())) { // nope.... need to move it @@ -1287,31 +1285,31 @@ void KviFrame::createTaskBar() { m_pTaskBar = new KviTreeTaskBar(); #ifdef COMPILE_USE_QT4 - m_pTaskBar->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - addDockWidget(Qt::LeftDockWidgetArea,m_pTaskBar); + m_pTaskBar->setAllowedAreas(TQt::LeftDockWidgetArea | TQt::RightDockWidgetArea); + addDockWidget(TQt::LeftDockWidgetArea,m_pTaskBar); #else //!COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockTop,false); - setDockEnabled(m_pTaskBar,Qt::DockBottom,false); + setDockEnabled(m_pTaskBar,TQt::DockTop,false); + setDockEnabled(m_pTaskBar,TQt::DockBottom,false); #endif //!COMPILE_USE_QT4 } else { m_pTaskBar = new KviClassicTaskBar(); #ifdef COMPILE_USE_QT4 - m_pTaskBar->setAllowedAreas(Qt::AllDockWidgetAreas); - addDockWidget(Qt::BottomDockWidgetArea,m_pTaskBar); + m_pTaskBar->setAllowedAreas(TQt::AllDockWidgetAreas); + addDockWidget(TQt::BottomDockWidgetArea,m_pTaskBar); #else //!COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockTop,true); - setDockEnabled(m_pTaskBar,Qt::DockBottom,true); + setDockEnabled(m_pTaskBar,TQt::DockTop,true); + setDockEnabled(m_pTaskBar,TQt::DockBottom,true); #endif //!COMPILE_USE_QT4 } #ifndef COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockLeft,true); - setDockEnabled(m_pTaskBar,Qt::DockRight,true); + setDockEnabled(m_pTaskBar,TQt::DockLeft,true); + setDockEnabled(m_pTaskBar,TQt::DockRight,true); #endif //!COMPILE_USE_QT4 } void KviFrame::recreateTaskBar() { - QString szOldClass = m_pTaskBar->className(); + TQString szOldClass = m_pTaskBar->className(); saveToolBarPositions(); KviWindow * w; @@ -1332,14 +1330,14 @@ void KviFrame::recreateTaskBar() /* - QString szNewClass = m_pTaskBar->className(); + TQString szNewClass = m_pTaskBar->className(); if(szOldClass != szNewClass) { // the class changed... // make sure that the tree task bar is in the left or right dock // and the classic one is in the top or bottom on - Qt::Dock dock; + TQt::Dock dock; int index; bool nl; int eo; @@ -1347,11 +1345,11 @@ void KviFrame::recreateTaskBar() if(KVI_OPTION_BOOL(KviOption_boolUseTreeWindowListTaskBar)) { - if((dock == Qt::Bottom) || (dock == Qt::Top)) - moveDockWindow(m_pTaskBar,Qt::Left); + if((dock == TQt::Bottom) || (dock == TQt::Top)) + moveDockWindow(m_pTaskBar,TQt::Left); } else { - if((dock == Qt::Left) || (dock == Qt::Right)) - moveDockWindow(m_pTaskBar,Qt::Bottom); + if((dock == TQt::Left) || (dock == TQt::Right)) + moveDockWindow(m_pTaskBar,TQt::Bottom); } } */ @@ -1359,41 +1357,6 @@ void KviFrame::recreateTaskBar() if(g_pActiveWindow)m_pTaskBar->setActiveItem(g_pActiveWindow->taskBarItem()); } - -#if QT_VERSION == 0x030201 -unsigned int KviFrame::windowState() -{ - /* enum GNWindowState { WindowNoState = 0x00000000, WindowMinimized = 0x00000001, - WindowMaximized = 0x00000002, WindowFullScreen = 0x00000004, WindowActive = 0x00000008 }; - GNWindowState GNWState; - if(isMinimized()) GNWState=WindowMinimized; - else if(isMaximized()) GNWState=WindowMaximized; - else if(isActiveWindow()) GNWState=WindowActive; - else if(isFullScreen()) GNWState=WindowFullScreen; - else GNWState=WindowNoState; */ - -/* WindowNoState = 0x00000000 WindowMinimized = 0x00000001 - WindowMaximized = 0x00000002 WindowFullScreen = 0x00000004 WindowActive = 0x00000008*/ - if(isMinimized()) return 0x00000001; - else if(isMaximized()) return 0x00000002; - else if(isActiveWindow()) return 0x00000008; - else if(isFullScreen()) return 0x00000004; - else return 0x00000000; -} -void KviFrame::setWindowState(unsigned int GNWState) -{ - switch(GNWState) - { - case 0x00000001: - showMinimized(); - break; - case 0x00000002: - showMaximized(); - break; - } // switch -} -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////// // Some accelerators //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1430,7 +1393,7 @@ void KviFrame::switchToNextWindowInContext(void) m_pTaskBar->switchWindow(true,true); } -void KviFrame::hideEvent ( QHideEvent * e) +void KviFrame::hideEvent ( TQHideEvent * e) { if(KVI_OPTION_BOOL(KviOption_boolMinimizeInTray)) { @@ -1441,7 +1404,7 @@ void KviFrame::hideEvent ( QHideEvent * e) { executeInternalCommand(KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } - QTimer::singleShot( 0, this, SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } } -- cgit v1.2.3