3 files changed, 17 insertions, 17 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 7ee681907..7a8b53b57 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -24,9 +24,9 @@
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktar.h>
 #include <ktrader.h>
 #include <kurldrag.h>
@@ -36,8 +36,8 @@ ThemeListBox::ThemeListBox(TQWidget *parent)
   : TDEListBox(parent)
 {
    setAcceptDrops(true);
-   connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
-           this, TQT_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
+   connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
+           this, TQ_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
 }
 
 void ThemeListBox::dragEnterEvent(TQDragEnterEvent* event)
@@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
 
 void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
 {
-   if ((button & Qt::LeftButton) == 0) return;
+   if ((button & TQt::LeftButton) == 0) return;
    mOldPos = p;
    mDragFile = TQString::null;
    int cur = index(item);
@@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
 
 void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
 {
-   if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
+   if (((e->state() & TQt::LeftButton) != 0) && !mDragFile.isEmpty())
    {
       int delay = TDEGlobalSettings::dndEventDelay();
       TQPoint newPos = e->globalPos();
@@ -100,21 +100,21 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
 
   mThemesList = new ThemeListBox(this);
   mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-  connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
-  connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
+  connect(mThemesList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSetTheme(int)));
+  connect(mThemesList, TQ_SIGNAL(filesDropped(const KURL::List&)), TQ_SLOT(slotFilesDropped(const KURL::List&)));
   leftbox->addWidget(mThemesList);
 
   mBtnAdd = new KPushButton( i18n("Add..."), this );
   leftbox->addWidget( mBtnAdd );
-  connect(mBtnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+  connect(mBtnAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
 
   mBtnRemove = new KPushButton( i18n("Remove"), this );
   leftbox->addWidget( mBtnRemove );
-  connect(mBtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+  connect(mBtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
 
   mBtnTest = new KPushButton( i18n("Test"), this );
   leftbox->addWidget( mBtnTest );
-  connect(mBtnTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTest()));
+  connect(mBtnTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTest()));
 
   TQVBoxLayout* rightbox = new TQVBoxLayout( hbox, KDialog::spacingHint() );
   hbox->setStretchFactor( rightbox, 3 );
@@ -123,7 +123,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
   mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
   mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
   mPreview->setMinimumSize(TQSize(320,240));
-  mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+  mPreview->setAlignment(TQt::AlignHCenter|TQt::AlignVCenter);
   rightbox->addWidget(mPreview);
   rightbox->setStretchFactor( mPreview, 3 );
 
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 7a46e368b..a88c3f632 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -24,9 +24,9 @@ class ThemeListBox;
 
 class SplashInstaller : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
-  SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=FALSE);
+  SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=false);
   ~SplashInstaller();
 
   virtual void load();
@@ -62,7 +62,7 @@ private:
 
 class ThemeListBox: public TDEListBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeListBox(TQWidget *parent);
   TQMap<TQString, TQString> text2path;
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index f0b5d1f52..0e9972bbe 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -19,7 +19,7 @@
 #include <tdecmodule.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "installer.h"
 
@@ -59,7 +59,7 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt
   TQHBoxLayout *box = new TQHBoxLayout(this, 0, 0);
   box->addWidget(mInstaller);
 #endif
-  connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+  connect( mInstaller, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
   TDEAboutData *about = new TDEAboutData( "kcmksplash"
                                       ,I18N_NOOP("TDE splash screen theme manager")
                                       ,"0.1"