diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:55:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:55:33 -0600 |
| commit | ae6cafee5339716bd01aa6c66aa4f366bdc5d43b (patch) | |
| tree | db682cc1b772442e3ac4986b8f66119531291a4e /src/systemtray.cpp | |
| parent | 882bcd26b3d60be72ea2b35921969a9850c52db9 (diff) | |
| download | basket-ae6cafee5339716bd01aa6c66aa4f366bdc5d43b.tar.gz basket-ae6cafee5339716bd01aa6c66aa4f366bdc5d43b.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9.
Diffstat (limited to 'src/systemtray.cpp')
| -rw-r--r-- | src/systemtray.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/systemtray.cpp b/src/systemtray.cpp index fdb7f40..7700f28 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -121,7 +121,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) // kapp->widgetAt(g + TQPoint(tw-1, 0)) != this || // kapp->widgetAt(g + TQPoint(0, th-1)) != this || // kapp->widgetAt(g + TQPoint(tw-1, th-1)) != this) { - int systrayManagerWinId = topLevelWidget()->winId(); + int systrayManagerWinId = tqtopLevelWidget()->winId(); KWin::forceActiveWindow(systrayManagerWinId); kapp->processEvents(); // Because without it the systrayManager is raised only after the messageBox is displayed // KWin::activateWindow(systrayManagerWinId); @@ -139,7 +139,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) TQString message = i18n( "<p>Closing the main window will keep %1 running in the system tray. " "Use <b>Quit</b> from the <b>Basket</b> menu to quit the application.</p>" - ).arg(KGlobal::instance()->aboutData()->programName()); + ).tqarg(KGlobal::instance()->aboutData()->programName()); // We are sure the systray icon is visible: ouf! if (useSystray) { // Compute size and position of the pixmap to be grabbed: @@ -161,10 +161,10 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) const int IMAGE_BORDER = 1; int ax = g.x() - x - CIRCLE_MARGINS - 1; int ay = g.y() - y - CIRCLE_MARGINS - 1; - painter.setPen( TQPen(KApplication::palette().active().dark(), CIRCLE_WIDTH) ); + painter.setPen( TQPen(KApplication::tqpalette().active().dark(), CIRCLE_WIDTH) ); painter.drawArc(ax + SHADOW_OFFSET, ay + SHADOW_OFFSET, tw + 2*CIRCLE_MARGINS, th + 2*CIRCLE_MARGINS, 0, 16*360); - painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, CIRCLE_WIDTH) ); + painter.setPen( TQPen(TQt::red/*KApplication::tqpalette().active().highlight()*/, CIRCLE_WIDTH) ); painter.drawArc(ax, ay, tw + 2*CIRCLE_MARGINS, th + 2*CIRCLE_MARGINS, 0, 16*360); #if 1 // Draw the pixmap over the screenshot in case a window hide the icon: @@ -174,7 +174,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) // Then, we add a border arround the image to make it more visible: TQPixmap finalShot(w + 2*IMAGE_BORDER, h + 2*IMAGE_BORDER); - finalShot.fill(KApplication::palette().active().foreground()); + finalShot.fill(KApplication::tqpalette().active().foreground()); painter.begin(&finalShot); painter.drawPixmap(IMAGE_BORDER, IMAGE_BORDER, shot); painter.end(); @@ -433,7 +433,7 @@ void SystemTray::updateToolTipDelayed() TQString tip = "<p><nobr>" + ( basket->isLocked() ? kapp->makeStdCaption(i18n("%1 (Locked)")) : kapp->makeStdCaption( "%1") ) - .arg(Tools::textToHTMLWithoutP(basket->basketName())); + .tqarg(Tools::textToHTMLWithoutP(basket->basketName())); TQToolTip::add(this, tip); } |