diff options
Diffstat (limited to 'src/kvirc/ui/kvi_toolbar.cpp')
| -rw-r--r-- | src/kvirc/ui/kvi_toolbar.cpp | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index 792f9fc0..7e62bf68 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -29,11 +29,11 @@ #include "kvi_locale.h" #include "kvi_app.h" -#include <qcursor.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif static KviTalPopupMenu * g_pToolBarContextPopup = 0; @@ -42,7 +42,7 @@ static KviTalPopupMenu * g_pToolBarIconSizesPopup = 0; static KviTalPopupMenu * g_pToolBarPositionsPopup = 0; -KviToolBar::KviToolBar(const QString &label,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) +KviToolBar::KviToolBar(const TQString &label,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) : KviTalToolBar(label,g_pFrame,dock,bNewLine,nam) { } @@ -60,7 +60,7 @@ KviToolBar::~KviToolBar() g_pToolBarWindowsPopup = 0; } -void KviToolBar::mousePressEvent(QMouseEvent *e) +void KviToolBar::mousePressEvent(TQMouseEvent *e) { if(!(e->button() & Qt::RightButton)) { @@ -81,67 +81,63 @@ void KviToolBar::mousePressEvent(QMouseEvent *e) g_pFrame->fillToolBarsPopup(g_pToolBarWindowsPopup); g_pToolBarContextPopup->insertItem(__tr2qs("Toolbars"),g_pToolBarWindowsPopup); - g_pToolBarContextPopup->insertItem(__tr2qs("Orientation"),g_pToolBarPositionsPopup); + g_pToolBarContextPopup->insertItem(__tr2qs("Qt::Orientation"),g_pToolBarPositionsPopup); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,SLOT(moveToTop())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,SLOT(moveToLeft())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,SLOT(moveToRight())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,SLOT(moveToBottom())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,TQT_SLOT(moveToTop())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,TQT_SLOT(moveToLeft())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,TQT_SLOT(moveToRight())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,TQT_SLOT(moveToBottom())); g_pToolBarPositionsPopup->insertSeparator(); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,SLOT(moveToTornOff())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,SLOT(moveToMinimized())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,TQT_SLOT(moveToTornOff())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,TQT_SLOT(moveToMinimized())); g_pToolBarContextPopup->insertItem(__tr2qs("Icon Size"),g_pToolBarIconSizesPopup); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,SLOT(setSmallIcons())); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,SLOT(setBigIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,TQT_SLOT(setSmallIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,TQT_SLOT(setBigIcons())); - g_pToolBarContextPopup->popup(QCursor::pos()); + g_pToolBarContextPopup->popup(TQCursor::pos()); } -void KviToolBar::moveTo(QT_TOOLBARDOCK_TYPE dock) +void KviToolBar::moveTo(TQT_TOOLBARDOCK_TYPE dock) { // FIXME: this should be hidden in Tal #ifdef COMPILE_USE_QT4 g_pFrame->removeToolBar(this); g_pFrame->addToolBar(dock,this); #else //!COMPILE_USE_QT4 -#if QT_VERSION >= 300 g_pFrame->moveDockWindow(this,dock); -#else - g_pFrame->moveToolBar(this,dock); -#endif #endif //!COMPILE_USE_QT4 } void KviToolBar::moveToTop() { - moveTo(QT_DOCK_TOP); + moveTo(TQT_DOCK_TOP); } void KviToolBar::moveToLeft() { - moveTo(QT_DOCK_LEFT); + moveTo(TQT_DOCK_LEFT); } void KviToolBar::moveToRight() { - moveTo(QT_DOCK_RIGHT); + moveTo(TQT_DOCK_RIGHT); } void KviToolBar::moveToBottom() { - moveTo(QT_DOCK_BOTTOM); + moveTo(TQT_DOCK_BOTTOM); } void KviToolBar::moveToMinimized() { - moveTo(QT_DOCK_MINIMIZED); + moveTo(TQT_DOCK_MINIMIZED); } void KviToolBar::moveToTornOff() { - moveTo(QT_DOCK_TORNOFF); + moveTo(TQT_DOCK_TORNOFF); } void KviToolBar::setBigIcons() |