1 files changed, 17 insertions, 17 deletions

diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 5e83641..67379c5 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <twin.h>
 #include <krun.h>
 
@@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config,
   m_sizeLayout->addWidget(m_rightFrame);
 
   connect(&KSim::PluginLoader::self(),
-     TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)),
-     this, TQT_SLOT(addMonitor(const KSim::Plugin &)));
+     TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)),
+     this, TQ_SLOT(addMonitor(const KSim::Plugin &)));
 
   KSim::ThemeLoader::self().themeColours(this);
 
@@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config,
     addPlugins();
   }
   
-  connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView()));
+  connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView()));
 }
 
 KSim::MainView::~MainView()
@@ -278,7 +278,7 @@ void KSim::MainView::reparseConfig(bool emitReload,
 
     if (!(*plugin).isDifferent() && (*plugin).isEnabled()) {
       kdDebug(2003) << "Recreating " << (*plugin).name() << "'s view" << endl;
-      kapp->processEvents();
+      tdeApp->processEvents();
       // Make sure the plugins background color is
       // set to the correct theme color
       if (themeChanged && (*plugin).view())
@@ -299,13 +299,13 @@ void KSim::MainView::reparseConfig(bool emitReload,
   for (it = list.begin(); it != list.end(); ++it) {
     if ((*it).isDifferent()) {
       if ((*it).isEnabled()) { // Go through the added/removed plugins and load/unload them
-        const KDesktopFile kdf((*it).filename());
+        const TDEDesktopFile kdf((*it).filename());
         addPlugin(kdf);
         m_prefDialog->createPage((*it).libName());
       }
       else {
         m_prefDialog->removePage((*it).libName());
-        const KDesktopFile kdf((*it).filename());
+        const TDEDesktopFile kdf((*it).filename());
         removePlugin(kdf);
       }
     }
@@ -334,19 +334,19 @@ void KSim::MainView::addPlugins()
   TQStringList::ConstIterator it;
   for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it)
   {
-    const KDesktopFile kdf(*it, true);
+    const TDEDesktopFile kdf(*it, true);
     addPlugin(kdf);
   }
 }
 
-void KSim::MainView::addPlugin(const KDesktopFile &file, bool force)
+void KSim::MainView::addPlugin(const TDEDesktopFile &file, bool force)
 {
   if (force || m_config->enabledMonitor(file.readEntry("X-KSIM-LIBRARY")))
     KSim::PluginLoader::self().loadPlugin(file);
 }
 
 // provided for convenience
-void KSim::MainView::removePlugin(const KDesktopFile &file)
+void KSim::MainView::removePlugin(const TDEDesktopFile &file)
 {
   KSim::PluginLoader::self().unloadPlugin(file.readEntry("X-KSIM-LIBRARY").local8Bit());
 }
@@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin)
 //  kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl;
 //  kdDebug(2003) << "location: " << location << endl;
   m_pluginLayout->addWidget(plugin.view());
-  connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)),
-     TQT_SLOT(runCommand(const TQCString &)));
+  connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)),
+     TQ_SLOT(runCommand(const TQCString &)));
 
 //  if (location > m_oldLocation)
 //    m_oldLocation = location;
@@ -393,8 +393,8 @@ void KSim::MainView::preferences()
 {
   if (m_prefDialog == 0L) {
     m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog");
-    connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)),
-       this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &)));
+    connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)),
+       this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &)));
   }
 
   m_prefDialog->exec();
@@ -458,9 +458,9 @@ TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const
   return TQSize(width, height);
 }
 
-void KSim::MainView::positionChange(Qt::Orientation o)
+void KSim::MainView::positionChange(TQt::Orientation o)
 {
-  if (o == Qt::Vertical)
+  if (o == TQt::Vertical)
      m_pluginLayout->setDirection(TQBoxLayout::TopToBottom);
   else
      m_pluginLayout->setDirection(TQBoxLayout::LeftToRight);