1 files changed, 14 insertions, 14 deletions
diff --git a/sessionapplet/usermanager.cpp b/sessionapplet/usermanager.cpp
index 107d9b8..01c05d8 100644
--- a/sessionapplet/usermanager.cpp
+++ b/sessionapplet/usermanager.cpp
@@ -19,25 +19,25 @@
  ***************************************************************************/
 
 #include <stdlib.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 // #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kapplication.h>
-#include <kdeversion.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdeversion.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include "dmctl.h"
 #include "usermanager.h"
 
-#define _ICONSET_(i) KGlobal::iconLoader()->loadIconSet(i, KIcon::Small, 0, false)
+#define _ICONSET_(i) TDEGlobal::iconLoader()->loadIconSet(i, TDEIcon::Small, 0, false)
 
 
 UserManager::UserManager(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
@@ -66,7 +66,7 @@ UserManager::UserManager(const TQString& configFile, Type type, int actions, TQW
    // languages
    langPopup = new TQPopupMenu(this);
    
-   KConfigBase *config = KGlobal::config();
+   TDEConfigBase *config = TDEGlobal::config();
    config->setGroup("Locale");
    langList = config->readListEntry ("Language", ':');
 //    TQString flag( locate( "locale", TQString::fromLatin1( "l10n/%1/flag.png" ).arg(langList[0]) ) );
@@ -123,14 +123,14 @@ void UserManager::logout()
 void UserManager::slotPopulateLanguages()
 {
    langPopup->clear();
-   KConfig *config = new KConfig("kdeglobals");
+   TDEConfig *config = new TDEConfig("kdeglobals");
    config->setGroup("Locale");
    langList = config->readListEntry ("Language", ':');
    int i = 0;
    for ( TQStringList::ConstIterator it = langList.begin();
          it != langList.end(); ++it )
    {
-      KConfig entry(locate( "locale", TQString::fromLatin1( "%1/entry.desktop" ).arg(*it) ));
+      TDEConfig entry(locate( "locale", TQString::fromLatin1( "%1/entry.desktop" ).arg(*it) ));
       entry.setGroup("KCM Locale");
       TQString name = entry.readEntry("Name", i18n("without name"));
       
@@ -147,7 +147,7 @@ void UserManager::slotLanguageActivated( int i )
       return; // no change, no action
    menu->changeItem ( 1, '[' + langList[i].section('_',0,0) + ']'/**langPopup->pixmap(i)*/ );
 //    langLabel->setPixmap(*langPopup->pixmap(i));
-   KConfig *config = new KConfig("kdeglobals");
+   TDEConfig *config = new TDEConfig("kdeglobals");
    config->setGroup("Locale");
    TQString tmp = langList[i];
    langList.remove(langList.at(i));
@@ -193,7 +193,7 @@ void UserManager::slotPopulateSessions()
       }
       // save
    sessionPopup->insertSeparator();
-   KConfig ksmserver("ksmserverrc", false, false);
+   TDEConfig ksmserver("ksmserverrc", false, false);
    ksmserver.setGroup("General");
    if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
    {
@@ -275,7 +275,7 @@ extern "C"
 {
     KPanelApplet* init( TQWidget *parent, const TQString& configFile)
     {
-        KGlobal::locale()->insertCatalogue("usermanager");
+        TDEGlobal::locale()->insertCatalogue("usermanager");
         return new UserManager(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "usermanager");
     }
 }