Use tdeAppHEADmaster

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

15 files changed, 39 insertions, 39 deletions

diff --git a/krename/ProgressDialog.cpp b/krename/ProgressDialog.cpp
index 33235e2..8952435 100644
--- a/krename/ProgressDialog.cpp
+++ b/krename/ProgressDialog.cpp
@@ -202,15 +202,15 @@ void ProgressDialog::done( int errors, int successfull, bool allowundo )
         buttonUndo->setEnabled( true );
     buttonCancel->setEnabled( false );
 
-    kapp->processEvents( 0 );
+    tdeApp->processEvents( 0 );
 }
 
 void ProgressDialog::show()
 {
     TQWidget::show();
 
-    int w = kapp->desktop()->width();
-    int h = kapp->desktop()->height();
+    int w = tdeApp->desktop()->width();
+    int h = tdeApp->desktop()->height();
     move( (w-width())/2,(h-height())/2 );
 }
 
@@ -348,7 +348,7 @@ void ProgressDialog::undo()
 
 void ProgressDialog::slotTimer()
 {
-    kapp->processEvents( 0 );
+    tdeApp->processEvents( 0 );
 }
 
 #include "ProgressDialog.moc"
diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp
index 1006c92..dcff215 100644
--- a/krename/commandplugin.cpp
+++ b/krename/commandplugin.cpp
@@ -97,7 +97,7 @@ void CommandPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     connect( buttonRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( remove() ) );
     connect( list, TQ_SIGNAL( executed( TQListBoxItem* ) ), this, TQ_SLOT( exec() ) );
 
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     conf->setGroup("CommandPlugin");
     list->insertStringList( conf->readListEntry("commandlines" ) );
     
@@ -144,7 +144,7 @@ TQString CommandPlugin::processFile( BatchRenamer* b, int i, TQString, int )
 
 void CommandPlugin::finished()
 {
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     conf->setGroup("CommandPlugin");
     TQStringList slist;
     for( unsigned int i = 0; i < list->count(); i++ )
@@ -186,7 +186,7 @@ void CommandPlugin::exec()
 
 const TQPixmap CommandPlugin::getIcon() const
 {
-    return kapp->iconLoader()->loadIcon( "konsole", TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( "konsole", TDEIcon::Small );
 }
 
 #include "commandplugin.moc"
diff --git a/krename/datetime.cpp b/krename/datetime.cpp
index 4d02ddf..588e45a 100644
--- a/krename/datetime.cpp
+++ b/krename/datetime.cpp
@@ -61,7 +61,7 @@ bool MyDatePlugin::checkError()
 
 const TQPixmap MyDatePlugin::getIcon() const
 {
-    return kapp->iconLoader()->loadIcon( "kalarm", TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( "kalarm", TDEIcon::Small );
 }
 
 void MyDatePlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
diff --git a/krename/encodingplugin.cpp b/krename/encodingplugin.cpp
index 369482d..4f1d28d 100644
--- a/krename/encodingplugin.cpp
+++ b/krename/encodingplugin.cpp
@@ -122,7 +122,7 @@ void EncodingPlugin::finished()
 
 const TQPixmap EncodingPlugin::getIcon() const
 {
-    return kapp->iconLoader()->loadIcon( "fonts", TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( "fonts", TDEIcon::Small );
 }
 
 void EncodingPlugin::enableControls()
diff --git a/krename/fileoperation.cpp b/krename/fileoperation.cpp
index 516843c..05bc8c0 100644
--- a/krename/fileoperation.cpp
+++ b/krename/fileoperation.cpp
@@ -86,7 +86,7 @@ bool FileOperation::start( const KURL & src, const KURL & dest, int mode, bool o
     connect( job, TQ_SIGNAL( result (TDEIO::Job *) ),
            this, TQ_SLOT( slotResult (TDEIO::Job *) ) );
 
-    kapp->eventLoop()->enterLoop();
+    tdeApp->eventLoop()->enterLoop();
     return !result;
 }
 
@@ -107,7 +107,7 @@ void FileOperation::slotResult( TDEIO::Job * job )
     if( result )
         m_error = job->errorString();
 
-    kapp->eventLoop()->exitLoop();
+    tdeApp->eventLoop()->exitLoop();
 }
 
 #include "fileoperation.moc"
diff --git a/krename/fileplugin.cpp b/krename/fileplugin.cpp
index 751dd82..6ad8b70 100644
--- a/krename/fileplugin.cpp
+++ b/krename/fileplugin.cpp
@@ -129,7 +129,7 @@ void FilePlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     TQHBoxLayout* hbox = new TQHBoxLayout( 0, 6, 6 );
     
     TQLabel* pix = new TQLabel( w );
-    pix->setPixmap( kapp->iconLoader()->loadIcon( m_icon, TDEIcon::Desktop ) );
+    pix->setPixmap( tdeApp->iconLoader()->loadIcon( m_icon, TDEIcon::Desktop ) );
     
     hbox->addWidget( pix );
     hbox->addWidget( new TQLabel( "<qt><b>"+getName()+"</b></qt>", w ) );
@@ -175,7 +175,7 @@ TQString FilePlugin::processFile( BatchRenamer* b, int i, TQString token, int )
                     cache.remove( cache.begin() );
 
                 cache.insert( filename + "::" + token, ret );
-                kapp->processEvents();
+                tdeApp->processEvents();
                 return ret;                    
             }
         }
@@ -195,7 +195,7 @@ void FilePlugin::addHelp( HelpDialogData* data )
 
 const TQPixmap FilePlugin::getIcon() const 
 {
-    return kapp->iconLoader()->loadIcon( m_icon, TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( m_icon, TDEIcon::Small );
 }
 
 bool FilePlugin::supports( const TQString & token )
diff --git a/krename/kmyhistorycombo.cpp b/krename/kmyhistorycombo.cpp
index 456ddba..8c79a7a 100644
--- a/krename/kmyhistorycombo.cpp
+++ b/krename/kmyhistorycombo.cpp
@@ -41,7 +41,7 @@ KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char
 {
     TQStringList history;
     TQStringList completion;
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup( name );
     this->setDuplicatesEnabled( false );
     
@@ -71,7 +71,7 @@ void KMyHistoryCombo::saveSettings()
 {
     addToHistory( text() );
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     
     config->setGroup( name() ? name() : "KMyHistoryCombo" );
     config->writeEntry( "History", historyItems() );
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index 5adf727..f642999 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -102,7 +102,7 @@ KRenameImpl::KRenameImpl( TQWidget* p, KMenuBar* m, TQPushButton* finish )
 
     m_switching = false;
     
-    kapp->dcopClient()->registerAs( kapp->name() );
+    tdeApp->dcopClient()->registerAs( tdeApp->name() );
 
 }
 
@@ -157,7 +157,7 @@ void KRenameImpl::setup( bool wizardmode )
     connect( preview, TQ_SIGNAL( removeItem(int) ), this, TQ_SLOT( removeFile(int) ));
     connect( preview, TQ_SIGNAL( addFile() ), this, TQ_SLOT( addFile() ));
     connect( undorequester, TQ_SIGNAL( urlSelected(const TQString &)), this, TQ_SLOT( changeUndoScriptName() ));
-    connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
+    connect( tdeApp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
     connect( buttonMove, TQ_SIGNAL( clicked()), fileList, TQ_SLOT( moveMode() ));
     connect( checkName, TQ_SIGNAL( clicked()), this, TQ_SLOT( toggleName() ));
     connect( buttonNumber, TQ_SIGNAL( clicked()), this, TQ_SLOT( changeNumbers() ));
@@ -283,7 +283,7 @@ void KRenameImpl::parseCommandline()
         // so let's wait for file adding to finish first
         // before starting.
         while( fileList->runningAddListeners() > 0 )
-            kapp->processEvents();
+            tdeApp->processEvents();
 
         if( fileList->count() ) 
             // start renaming
@@ -987,7 +987,7 @@ void KRenameImpl::removeFile( int index )
 
 void KRenameImpl::help()
 {
-    kapp->invokeHelp();
+    tdeApp->invokeHelp();
 }
 
 void KRenameImpl::start()
@@ -1011,7 +1011,7 @@ void KRenameImpl::start()
     filename->saveSettings();
     extemplate->saveSettings();
 
-    TDEConfig * config = kapp->config();
+    TDEConfig * config = tdeApp->config();
     config->setGroup("FileExtension");
     config->writeEntry("FileExtensionCombo", comboExtension->currentItem() );
 
@@ -1258,7 +1258,7 @@ void KRenameImpl::updatePreview()
 
 void KRenameImpl::loadConfig()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("HistSize");
     m_hist = config->readNumEntry("HistoryItems", 10 );
@@ -1324,7 +1324,7 @@ void KRenameImpl::loadConfig()
 
 void KRenameImpl::saveConfig()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("HistSize");
     config->writeEntry("HistoryItems", m_hist );
@@ -1610,7 +1610,7 @@ void KRenameImpl::changeNumbers()
 
 void KRenameImpl::about()
 {
-    TDEAboutApplication * d = new TDEAboutApplication( kapp->aboutData(), parent );
+    TDEAboutApplication * d = new TDEAboutApplication( tdeApp->aboutData(), parent );
     d->show();
 }
 
@@ -1663,7 +1663,7 @@ void KRenameImpl::changeParent( TQWidget* p, KMenuBar* m, TQPushButton* finish,
 
 TQWidget* KRenameImpl::launch( TQRect rect, const KURL::List & list, KRenameImpl* impl, bool loadprofile )
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("GUISettings");
     bool firststart = config->readBoolEntry( "firststart", true );
     bool wizardmode = config->readBoolEntry( "GUIWizardMode", false );
@@ -1693,7 +1693,7 @@ TQWidget* KRenameImpl::launch( TQRect rect, const KURL::List & list, KRenameImpl
         w = (TQWidget*)krename;
     }
 
-    kapp->setMainWidget( w );
+    tdeApp->setMainWidget( w );
 
     for( unsigned int i = 0; i < list.count(); i++ )
         k->addFileOrDir( list[i] );
diff --git a/krename/mydirplugin.cpp b/krename/mydirplugin.cpp
index 668c61c..c681442 100644
--- a/krename/mydirplugin.cpp
+++ b/krename/mydirplugin.cpp
@@ -54,7 +54,7 @@ bool MyDirPlugin::checkError()
 
 const TQPixmap MyDirPlugin::getIcon() const
 {
-    return kapp->iconLoader()->loadIcon( "folder", TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( "folder", TDEIcon::Small );
 }
 
 void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
diff --git a/krename/permission.cpp b/krename/permission.cpp
index 512e485..39c0373 100644
--- a/krename/permission.cpp
+++ b/krename/permission.cpp
@@ -323,7 +323,7 @@ void MyPermPlugin::enableControls()
 
 const TQPixmap MyPermPlugin::getIcon() const
 {
-    return kapp->iconLoader()->loadIcon( "clanbomber", TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( "clanbomber", TDEIcon::Small );
 }
 
 #include "permission.moc"
diff --git a/krename/pluginloader.cpp b/krename/pluginloader.cpp
index 30b78f5..8f8edf5 100644
--- a/krename/pluginloader.cpp
+++ b/krename/pluginloader.cpp
@@ -169,7 +169,7 @@ void PluginLoader::loadFilePlugins()
             FilePlugin* tdefileplugin = new FilePlugin( s );
             if( tdefileplugin->isValid() ) {
                 addPlugin( tdefileplugin );
-                kapp->processEvents();
+                tdeApp->processEvents();
             } else
                 delete tdefileplugin;
         }
diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp
index 54ea4a3..1728ff8 100644
--- a/krename/profiledlg.cpp
+++ b/krename/profiledlg.cpp
@@ -96,7 +96,7 @@ ProfileManager::ProfileManager( KRenameImpl* krename )
 const TQString ProfileManager::readProfilePath( const TQString & name )
 {
     TQString path;
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     
     conf->setGroup( "Profiles" );
     path = conf->readEntry( name, TQString() );
@@ -115,7 +115,7 @@ const TQString ProfileManager::getProfilePath( const TQString & name )
 
     TQString path = locateLocal( "data", TQString( "krename/%1.xml" ).arg( name ) );
     
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     
     conf->setGroup( "ProfilesHeader" );
     list = conf->readListEntry( "list" );
@@ -364,7 +364,7 @@ const TQValueList<int> ProfileManager::stringToList( const TQString & data )
 
 bool ProfileManager::hasDefaultProfile()
 {
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     conf->setGroup( "ProfilesHeader" );
 
     TQString def = conf->readEntry( "defprofile", TQString() );
@@ -374,7 +374,7 @@ bool ProfileManager::hasDefaultProfile()
 
 void ProfileManager::loadDefaultProfile( KRenameImpl* krename )
 {
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     conf->setGroup( "ProfilesHeader" );
 
     TQString def = conf->readEntry( "defprofile", TQString() );
@@ -437,7 +437,7 @@ ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name)
     connect( checkDefault, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSetDefault() ) );
     connect( this, TQ_SIGNAL( hidden() ), this, TQ_SLOT( slotHidden() ) );
 
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     conf->setGroup( "ProfilesHeader" );
     ProfileListBoxText* item;
 
@@ -565,7 +565,7 @@ void ProfileDlg::slotDeleteProfile()
         if( item )
             delete item;
         
-        TDEConfig* conf = kapp->config();
+        TDEConfig* conf = tdeApp->config();
         
         conf->setGroup( "ProfilesHeader" );
         TQStringList list = conf->readListEntry( "list" );
@@ -580,7 +580,7 @@ void ProfileDlg::slotDeleteProfile()
 void ProfileDlg::slotHidden()
 {
     int i;
-    TDEConfig* conf = kapp->config();
+    TDEConfig* conf = tdeApp->config();
     TQString def = TQString();
     ProfileListBoxText* item;
 
diff --git a/krename/tabs.cpp b/krename/tabs.cpp
index bb7b49c..9c17f40 100644
--- a/krename/tabs.cpp
+++ b/krename/tabs.cpp
@@ -78,7 +78,7 @@ tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
 
     // Tell TDEStartupInfo that KRename has been loaded completly
     TDEStartupInfoId id;
-    id.initId( kapp->startupId() );
+    id.initId( tdeApp->startupId() );
     TDEStartupInfo::sendFinish( id );
 }
 
diff --git a/krename/translitplugin.cpp b/krename/translitplugin.cpp
index aed2b9c..c7cbe91 100644
--- a/krename/translitplugin.cpp
+++ b/krename/translitplugin.cpp
@@ -40,7 +40,7 @@ const TQString TranslitPlugin::getAccelName() const
 
 const TQPixmap TranslitPlugin::getIcon() const
 {
-    return kapp->iconLoader()->loadIcon( "fonts", TDEIcon::Small );
+    return tdeApp->iconLoader()->loadIcon( "fonts", TDEIcon::Small );
 }
 
 const int TranslitPlugin::type() const
diff --git a/krename/wizard.cpp b/krename/wizard.cpp
index a15de92..a0482a2 100644
--- a/krename/wizard.cpp
+++ b/krename/wizard.cpp
@@ -55,7 +55,7 @@ wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* parent,  const char* name
     
     // Tell TDEStartupInfo that KRename has been loaded completly
     TDEStartupInfoId id;
-    id.initId( kapp->startupId() );
+    id.initId( tdeApp->startupId() );
     TDEStartupInfo::sendFinish( id );
     
     // Disable ESC key