Rename KApplication to TDEApplication to avoid conflicts with KDE4

11 files changed, 12 insertions, 12 deletions

diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index 4af2bcb1e..1873a13df 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -354,7 +354,7 @@ please visit http://webcvs.kde.org
 
 	* Removed hardcoded localtdedir()
 
-	* Let KApplication() do the job of creating ~/.kde/share/config
+	* Let TDEApplication() do the job of creating ~/.kde/share/config
 
 1998-10-31  Stefan Taferner  <taferner@kde.org> (KMail-1.0.6)
 
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index a63ecae94..951a33798 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability()
     }
     else {
       // check the availability of the application
-      KApplication::kApplication()->processEvents( 200 );
+      TDEApplication::kApplication()->processEvents( 200 );
       if ( !checkForProgram( (*it).getExecutable() ) ) {
         mInfoPage->addAvailableTool( (*it).getVisibleName() );
         found = true;
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index 0e5b14d80..04ba43b92 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -18,7 +18,7 @@ int main(int argc,char **argv)
   KAboutData aboutData( "testKMailDCOP",
    "Test for KMail DCOP interface", "0.0" );
   TDECmdLineArgs::init(argc, argv, &aboutData);
-  KApplication app;
+  TDEApplication app;
   app.dcopClient()->attach();
 
   KMailIface_stub kmailStub("kmail","KMailIface");
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 4355c9df2..2584f9258 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -75,9 +75,9 @@ int FolderTreeBase::dndMode(bool alwaysAsk)
 {
   int action = -1;
   int keybstate = kapp->keyboardModifiers();
-  if ( keybstate & KApplication::ControlModifier ) {
+  if ( keybstate & TDEApplication::ControlModifier ) {
     action = DRAG_COPY;
-  } else if ( keybstate & KApplication::ShiftModifier ) {
+  } else if ( keybstate & TDEApplication::ShiftModifier ) {
     action = DRAG_MOVE;
   } else {
     if ( GlobalSettings::self()->showPopupAfterDnD() || alwaysAsk ) {
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 3194b0ca7..d2d9ca374 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1743,7 +1743,7 @@ KMCommand::Result KMFilterActionCommand::execute()
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
       KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
-      KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
+      TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
     int filterResult = kmkernel->filterMgr()->process( serNum, mFilter );
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 2b4d155db..c12a58915 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1040,7 +1040,7 @@ TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
   if (aFileName.isEmpty())
   {
     aFileName.sprintf("%ld.%d.", (long)time(0), getpid());
-    aFileName += KApplication::randomString(5);
+    aFileName += TDEApplication::randomString(5);
   }
 
   if (!suffix_regex)
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 0b10d3d4d..aaa4669f7 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -1453,7 +1453,7 @@ void KMHeaders::applyFiltersOnMsg()
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
         KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
-        KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
+        TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
       KMFolder *folder = 0;
diff --git a/kmail/main.cpp b/kmail/main.cpp
index e76b303f6..628ae97ad 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -48,7 +48,7 @@ public:
 void KMailApplication::commitData(TQSessionManager& sm) {
   kmkernel->dumpDeadLetters();
   kmkernel->setShuttingDown( true ); // Prevent further dumpDeadLetters calls
-  KApplication::commitData( sm );
+  TDEApplication::commitData( sm );
 }
 
 
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 8d87d2d40..f2cf1f745 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -177,7 +177,7 @@ RecipientLine::RecipientLine( TQWidget *parent )
            this, TQT_SLOT( slotTypeModified() ) );
 
   mRemoveButton = new TQPushButton( this );
-  mRemoveButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
+  mRemoveButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
   topLayout->addWidget( mRemoveButton );
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropagateDeletion() ) );
   TQToolTip::add( mRemoveButton, i18n("Remove recipient line") );
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index e347fe5cf..54141bb5a 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -94,7 +94,7 @@ int main( int argc, char **argv )
    "Test Recipient Editor", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
 
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 01c3c5097..d6181a083 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -373,7 +373,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent )
 
   TQToolButton *button = new TQToolButton( this );
   button->setIconSet( KGlobal::iconLoader()->loadIconSet(
-              KApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
   searchLayout->addWidget( button );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) );