1 files changed, 29 insertions, 29 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp
index 2580794..5038752 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -40,7 +40,7 @@
 #include <tdestartupinfo.h>
 #include <twin.h>
 #include <twinmodule.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 
@@ -136,37 +136,37 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject()
         mState       = Normal;
 
         mWin = new KWinModule;
-        connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)),
-                this, TQT_SLOT(slotWindowActivate(WId)));
-        connect(mWin, TQT_SIGNAL(windowRemoved(WId)),
-                this, TQT_SLOT(slotWindowRemove(WId)));
-        connect(mWin, TQT_SIGNAL(stackingOrderChanged()),
-                this, TQT_SLOT(slotStackingChanged()));
-        connect(mWin, TQT_SIGNAL(windowChanged(WId, const unsigned long *)),
-                this, TQT_SLOT(slotWindowChange(WId, const unsigned long *)));
-        connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)),
-                this, TQT_SLOT(slotDesktopChange(int)));
+        connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)),
+                this, TQ_SLOT(slotWindowActivate(WId)));
+        connect(mWin, TQ_SIGNAL(windowRemoved(WId)),
+                this, TQ_SLOT(slotWindowRemove(WId)));
+        connect(mWin, TQ_SIGNAL(stackingOrderChanged()),
+                this, TQ_SLOT(slotStackingChanged()));
+        connect(mWin, TQ_SIGNAL(windowChanged(WId, const unsigned long *)),
+                this, TQ_SLOT(slotWindowChange(WId, const unsigned long *)));
+        connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)),
+                this, TQ_SLOT(slotDesktopChange(int)));
 
         mAmor = new AmorWidget();
-        connect(mAmor, TQT_SIGNAL(mouseClicked(const TQPoint &)),
-                        TQT_SLOT(slotMouseClicked(const TQPoint &)));
-        connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)),
-                        TQT_SLOT(slotWidgetDragged(const TQPoint &, bool)));
+        connect(mAmor, TQ_SIGNAL(mouseClicked(const TQPoint &)),
+                        TQ_SLOT(slotMouseClicked(const TQPoint &)));
+        connect(mAmor, TQ_SIGNAL(dragged(const TQPoint &, bool)),
+                        TQ_SLOT(slotWidgetDragged(const TQPoint &, bool)));
         mAmor->resize(mTheme.maximumSize());
 
         mTimer = new TQTimer(this);
-        connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+        connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 
         mStackTimer = new TQTimer(this);
-        connect(mStackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(restack()));
+        connect(mStackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(restack()));
     
 	mBubbleTimer = new TQTimer(this);
-	connect(mBubbleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBubbleTimeout()));
+	connect(mBubbleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBubbleTimeout()));
 
         time(&mActiveTime);
         mCursPos = TQCursor::pos();
         mCursorTimer = new TQTimer(this);
-        connect(mCursorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCursorTimeout()));
+        connect(mCursorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCursorTimeout()));
 	mCursorTimer->start( 500 );
 
         if (mWin->activeWindow())
@@ -191,7 +191,7 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject()
     }
     else
     {
-        kapp->quit();
+        tdeApp->quit();
     }
 }
 
@@ -315,7 +315,7 @@ bool Amor::readConfig()
         
         // Store relative paths into files to avoid storing absolute pathnames.
         TDEGlobal::dirs()->findAllResources("appdata", "*rc", false, false, files);
-        int randomTheme = kapp->random() % files.count();
+        int randomTheme = tdeApp->random() % files.count();
         mConfig.mTheme = (TQString)*files.at(randomTheme);
     }
 	
@@ -473,7 +473,7 @@ void Amor::selectAnimation(State state)
 		        if (mTargetRect.width() == mCurrAnim->frame()->width())
 			    mPosition = mCurrAnim->hotspot().x();
 			else
-			    mPosition = ( kapp->random() %
+			    mPosition = ( tdeApp->random() %
 					  (mTargetRect.width() - mCurrAnim->frame()->width()) )
 					 + mCurrAnim->hotspot().x();
 		    }
@@ -610,10 +610,10 @@ void Amor::slotMouseClicked(const TQPoint &pos)
         TDEPopupMenu* helpMnu = help->menu();
         mMenu = new TDEPopupMenu();
         mMenu->insertTitle("Amor"); // I really don't want this i18n'ed
-        mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure()));
+        mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQ_SLOT(slotConfigure()));
         mMenu->insertSeparator();
         mMenu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
-        mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), kapp, TQT_SLOT(quit()));
+        mMenu->insertItem(SmallIcon("system-log-out"), i18n("&Quit"), tdeApp, TQ_SLOT(quit()));
     }
 
     mMenu->exec(pos);
@@ -680,7 +680,7 @@ void Amor::slotTimeout()
 	// only displayed on the first frame of mBaseAnim (the old way of doing this).
 	if ( !mTipsQueue.isEmpty() && !mBubble &&  mConfig.mAppTips)
 	    showBubble();
-	else if (kapp->random()%TIP_FREQUENCY == 1 && mConfig.mTips && !mBubble && !mCurrAnim->frameNum())
+	else if (tdeApp->random()%TIP_FREQUENCY == 1 && mConfig.mTips && !mBubble && !mCurrAnim->frameNum())
         {
 	    mTipsQueue.enqueue(new QueueItem(QueueItem::Tip, mTips.tip())); 
 	    showBubble();
@@ -710,9 +710,9 @@ void Amor::slotConfigure()
     if (!mAmorDialog)
     {
         mAmorDialog = new AmorDialog();
-        connect(mAmorDialog, TQT_SIGNAL(changed()), TQT_SLOT(slotConfigChanged()));
-        connect(mAmorDialog, TQT_SIGNAL(offsetChanged(int)),
-                TQT_SLOT(slotOffsetChanged(int)));
+        connect(mAmorDialog, TQ_SIGNAL(changed()), TQ_SLOT(slotConfigChanged()));
+        connect(mAmorDialog, TQ_SIGNAL(offsetChanged(int)),
+                TQ_SLOT(slotOffsetChanged(int)));
     }
 
     mAmorDialog->show();
@@ -1014,7 +1014,7 @@ AmorSessionWidget::AmorSessionWidget()
 {
     // the only function of this widget is to catch & forward the
     // saveYourself() signal from the session manager
-    connect(kapp, TQT_SIGNAL(saveYourself()), TQT_SLOT(wm_saveyourself()));
+    connect(tdeApp, TQ_SIGNAL(saveYourself()), TQ_SLOT(wm_saveyourself()));
 }
 
 void AmorSessionWidget::wm_saveyourself()