Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

4 files changed, 10 insertions, 10 deletions

diff --git a/kuser/main.cpp b/kuser/main.cpp
index af623ce..06e3ad6 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -52,9 +52,9 @@ int main(int argc, char **argv)
 
   TDEApplication a;
 
-  kapp->sharedConfig()->setGroup( "general" );
+  tdeApp->sharedConfig()->setGroup( "general" );
   kug = new KUserGlobals();
-  kug->initCfg( kapp->sharedConfig()->readEntry( "connection", "default" ) );
+  kug->initCfg( tdeApp->sharedConfig()->readEntry( "connection", "default" ) );
   
   mw = new mainWidget("kuser");
   a.setMainWidget(mw);
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 84ffa81..febd3b6 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -139,7 +139,7 @@ TQCString genSalt( int len )
     
   salt[0] = set[getpid() % strlen(set)];
   for( int i = 1; i < len; i++ ) {
-    salt[i] = set[kapp->random() % strlen(set)];
+    salt[i] = set[tdeApp->random() % strlen(set)];
   }
   return salt;
 }
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index 9ab2911..67a38cb 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -50,7 +50,7 @@ SelectConn::SelectConn(const TQString &selected, TQWidget* parent, const char *
   mSelected = selected;
   kdDebug() << "selected item: " << mSelected << endl;
 
-  conns = kapp->sharedConfig()->groupList();
+  conns = tdeApp->sharedConfig()->groupList();
   TQStringList::iterator it = conns.begin();
   int i = 0, sel = 0;
   while ( it != conns.end() ) {
@@ -80,12 +80,12 @@ void SelectConn::slotUser3()
   newconn = KInputDialog::getText( TQString(),
     i18n("Please type the name of the new connection:") );
   if ( newconn.isEmpty() ) return;
-  if ( kapp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) {
+  if ( tdeApp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) {
     KMessageBox::sorry( 0, i18n("A connection with this name already exists.") );
     return;
   }
 
-  KUserPrefsBase kcfg( kapp->sharedConfig(), newconn );
+  KUserPrefsBase kcfg( tdeApp->sharedConfig(), newconn );
 
   editDefaults eddlg( &kcfg, this );
   connect(&eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotNewApplySettings()));
@@ -107,7 +107,7 @@ void SelectConn::slotNewApplySettings()
 void SelectConn::slotUser2()
 {
   kdDebug() << "slotUser2: " << connSelected() << endl;
-  KUserPrefsBase kcfg( kapp->sharedConfig(), connSelected() );
+  KUserPrefsBase kcfg( tdeApp->sharedConfig(), connSelected() );
   kcfg.readConfig();
 
   editDefaults eddlg( &kcfg, this );
@@ -122,8 +122,8 @@ void SelectConn::slotUser1()
   if ( KMessageBox::warningContinueCancel( 0, i18n("Do you really want to delete the connection '%1'?").
     arg( conn ),i18n("Delete Connection"),KStdGuiItem::del() ) == KMessageBox::Cancel ) return;
 
-  kapp->sharedConfig()->deleteGroup( "connection-" + conn, true );
-  kapp->sharedConfig()->sync();
+  tdeApp->sharedConfig()->deleteGroup( "connection-" + conn, true );
+  tdeApp->sharedConfig()->sync();
   mCombo->removeItem( mCombo->currentItem() );
   if ( mCombo->count() == 0 ) {
     mCombo->insertItem( "default" );
diff --git a/kuser/tdeglobal.cpp b/kuser/tdeglobal.cpp
index 287f475..479125c 100644
--- a/kuser/tdeglobal.cpp
+++ b/kuser/tdeglobal.cpp
@@ -42,7 +42,7 @@ void KUserGlobals::initCfg( const TQString &connection )
     cfg->writeConfig();
     delete cfg;
   }    
-  cfg = new KUserPrefsBase( kapp->sharedConfig(), connection );
+  cfg = new KUserPrefsBase( tdeApp->sharedConfig(), connection );
   cfg->readConfig();
 }