1 files changed, 20 insertions, 20 deletions

diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 19377c1b4..e7226c8a4 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeactionclasses.h>
 #include <kickertip.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <krun.h>
 #include <kiconeffect.h>
 #include <tdeglobalsettings.h>
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kipc.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <math.h>
 #include <algorithm>
@@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u)
 }
 
 void QuickURL::run() const
-{  kapp->propagateSessionManager();   // is this needed?
+{  tdeApp->propagateSessionManager();   // is this needed?
    if (_service)
       KRun::run(*(_service), KURL::List());
    else
@@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
        pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
    }
    // Resize to fit button
-   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin));
+   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin));
    return pxmap;
 }
 
@@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
         setToggleButton(true);
         setOn( ShowDesktop::the()->desktopShowing() );
-        connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+        connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
     }
 
     TQToolTip::add(this, _qurl->name());
@@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     configAction->plug(_popup);
         _popup->insertSeparator();
     _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), 
-            this, TQT_SLOT(removeApp()));
+            this, TQ_SLOT(removeApp()));
 
     m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"),
-        TDEShortcut(), TQT_TQOBJECT(this));
-    connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), 
-        this, TQT_SLOT(slotStickyToggled(bool)));
+        TDEShortcut(), this);
+    connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), 
+        this, TQ_SLOT(slotStickyToggled(bool)));
     m_stickyAction->plug(_popup, 2);
     m_stickyId = _popup->idAt(2);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch()));
-    connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent,
-        TQT_SLOT(removeAppManually(QuickButton *)));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch()));
+    connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent,
+        TQ_SLOT(removeAppManually(QuickButton *)));
 }
 
 QuickButton::~QuickButton()
@@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)
 
 void QuickButton::mousePressEvent(TQMouseEvent *e)
 {
-   if (e->button() == Qt::RightButton)
+   if (e->button() == TQt::RightButton)
       _popup->popup(e->globalPos());
-   else if (e->button() == Qt::LeftButton) {
+   else if (e->button() == TQt::LeftButton) {
       _dragPos = e->pos();
       TQButton::mousePressEvent(e);
    }
@@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)
 
 void QuickButton::mouseMoveEvent(TQMouseEvent *e)
 {
-   if ((e->state() & Qt::LeftButton) == 0) return;
+   if ((e->state() & TQt::LeftButton) == 0) return;
    TQPoint p(e->pos() - _dragPos);
    if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
       return;
@@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
        dd->drag();
        releaseKeyboard();
    } else {
-       setCursor(Qt::ForbiddenCursor);
+       setCursor(TQt::ForbiddenCursor);
    }
 }
 
@@ -266,10 +266,10 @@ void QuickButton::launch()
    }
    if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
        if (isOn()) {
-           ShowDesktop::the()->showDesktop(TRUE);
+           ShowDesktop::the()->showDesktop(true);
        }
        else {
-           ShowDesktop::the()->showDesktop(FALSE);
+           ShowDesktop::the()->showDesktop(false);
        }
    }
    else {
@@ -303,7 +303,7 @@ void QuickButton::removeApp()
 void QuickButton::flash()
 {
    m_flashCounter = 2000;
-   TQTimer::singleShot(0, this, TQT_SLOT(slotFlash()));
+   TQTimer::singleShot(0, this, TQ_SLOT(slotFlash()));
 }
 
 void QuickButton::slotFlash()
@@ -314,7 +314,7 @@ void QuickButton::slotFlash()
         m_flashCounter -= timeout;
         if (m_flashCounter < 0) m_flashCounter = 0;
         update();
-        TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash()));
+        TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash()));
     }
 }