diff options
Diffstat (limited to 'tdeui/ksystemtray.cpp')
| -rw-r--r-- | tdeui/ksystemtray.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index fd58c6d06..192b378b5 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -28,7 +28,7 @@ #include "tdelocale.h" #include "tdeaboutdata.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #include <twinmodule.h> #include <qxembed.h> @@ -61,30 +61,30 @@ public: KSystemTray::KSystemTray( TQWidget* parent, const char* name ) : TQLabel( parent, name, (WFlags)WType_TopLevel ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 QXEmbed::initialize(); #endif d = new KSystemTrayPrivate; d->actionCollection = new TDEActionCollection(this); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): tqt_xrootwin() ); #endif setBackgroundMode(X11ParentRelative); setBackgroundOrigin(WindowOrigin); hasQuit = 0; menu = new TDEPopupMenu( this ); - menu->insertTitle( kapp->miniIcon(), kapp->caption() ); + menu->insertTitle( tdeApp->miniIcon(), tdeApp->caption() ); move( -1000, -1000 ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection); if (parentWidget()) { - new TDEAction(i18n("Minimize"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), + new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), + this, TQ_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); d->on_all_desktops = info.onAllDesktops(); #else @@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( TDEGlobal::instance()->aboutData()->programName()); - setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + setAlignment( alignment() | TQt::AlignVCenter | TQt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); @@ -148,12 +148,12 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: toggleActive(); break; - case Qt::MidButton: + case TQt::MidButton: // fall through - case Qt::RightButton: + case TQt::RightButton: if ( parentWidget() ) { TDEAction* action = d->actionCollection->action("minimizeRestore"); if ( parentWidget()->isVisible() ) @@ -193,12 +193,12 @@ void KSystemTray::minimizeRestoreAction() void KSystemTray::maybeQuit() { TQString query = i18n("<qt>Are you sure you want to quit <b>%1</b>?</qt>") - .arg(kapp->caption()); + .arg(tdeApp->caption()); if (KMessageBox::warningContinueCancel(this, query, i18n("Confirm Quit From System Tray"), KStdGuiItem::quit(), TQString("systemtrayquit%1") - .arg(kapp->caption())) != + .arg(tdeApp->caption())) != KMessageBox::Continue) { return; @@ -244,7 +244,7 @@ void KSystemTray::activateOrHide() if ( !pw ) return; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info1 = KWin::windowInfo( pw->winId(), NET::XAWMState | NET::WMState ); // mapped = visible (but possibly obscured) bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized(); @@ -288,7 +288,7 @@ void KSystemTray::minimizeRestore( bool restore ) TQWidget* pw = parentWidget(); if( !pw ) return; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info = KWin::windowInfo( pw->winId(), NET::WMGeometry | NET::WMDesktop ); if ( restore ) { @@ -314,7 +314,7 @@ TDEActionCollection* KSystemTray::actionCollection() TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance ) { - TDEConfig *appCfg = kapp->config(); + TDEConfig *appCfg = tdeApp->config(); TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth ); @@ -333,7 +333,7 @@ void KSystemTray::setPixmap( const TQPixmap& p ) iconPixmapToSet.convertFromImage(correctedImage); } TQLabel::setPixmap( iconPixmapToSet ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::setIcons( winId(), iconPixmapToSet, TQPixmap()); #endif } |