Rename KApplication to TDEApplication to avoid conflicts with KDE4

13 files changed, 21 insertions, 21 deletions

diff --git a/twin/README b/twin/README
index 3e4e49219..652fa83ae 100644
--- a/twin/README
+++ b/twin/README
@@ -189,10 +189,10 @@ from Konsole as 'dcop kdesktop KDesktopIface popupExecuteCommand" will lead
 to showing the minicli, but the last user activity timestamp gained from events
 sent by X server will be older than user activity timestamp of Konsole, and
 would normally result in minicli not being active. Therefore, before showing
-the minicli, kdesktop needs to call KApplication::updateUserTimestamp().
+the minicli, kdesktop needs to call TDEApplication::updateUserTimestamp().
 
  However, this shouldn't be done with all DCOP calls. If a DCOP call is not
-a result of direct user action, calling KApplication::updateUserTimestamp()
+a result of direct user action, calling TDEApplication::updateUserTimestamp()
 would lead to focus stealing. For example, let's assume for a moment
 that KMail would use this DCOP call in case it detects the modem is not
 connected, allowing to you to start KPPP or whatever tool you use. If KMail
@@ -201,6 +201,6 @@ possibly suddenly showing up at every check. Basically, doing the above change
 to kdesktop's minicli means that the popupExecuteCommand() DCOP call is only
 for user scripting. (TODO write about focus transferring?)
 
- Simply said, KApplication::updateUserTimestamp() should be called only
+ Simply said, TDEApplication::updateUserTimestamp() should be called only
 as a result of user action. Unfortunately, I'm not aware of any universal
 way how to handle this, so every case will have to be considered separately.
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index c9bb6133c..41f5dd7ca 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
 {
     TDECmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1");
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app(argc, argv);
+    TDEApplication app(argc, argv);
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if(!args->count()){
         kdWarning() << "You need to specify the path to a theme config file!" << endl;
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 4215ec38f..9e99bb749 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -42,7 +42,7 @@ namespace KWinInternal
 void Workspace::desktopResized()
     {
     //printf("Workspace::desktopResized()\n\r");
-    TQRect geom = KApplication::desktop()->geometry();
+    TQRect geom = TDEApplication::desktop()->geometry();
     NETSize desktop_geometry;
     desktop_geometry.width = geom.width();
     desktop_geometry.height = geom.height();
@@ -58,7 +58,7 @@ void Workspace::desktopResized()
 void Workspace::kDestopResized()
     {
     //printf("Workspace::kDesktopResized()\n\r");
-    TQRect geom = KApplication::desktop()->geometry();
+    TQRect geom = TDEApplication::desktop()->geometry();
     NETSize desktop_geometry;
     desktop_geometry.width = geom.width();
     desktop_geometry.height = geom.height();
@@ -82,7 +82,7 @@ void Workspace::kDestopResized()
 
 void Workspace::updateClientArea( bool force )
     {
-    TQDesktopWidget *desktopwidget = KApplication::desktop();
+    TQDesktopWidget *desktopwidget = TDEApplication::desktop();
     int nscreens = desktopwidget -> numScreens ();
 //    kdDebug () << "screens: " << nscreens << endl;
     TQRect* new_wareas = new TQRect[ numberOfDesktops() + 1 ];
@@ -295,7 +295,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co
 
 TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int desktop ) const
     {
-    TQDesktopWidget *desktopwidget = KApplication::desktop();
+    TQDesktopWidget *desktopwidget = TDEApplication::desktop();
     int screen = desktopwidget->screenNumber( p );
     if( screen < 0 )
         screen = desktopwidget->primaryScreen();
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index c29dacdaa..b97db201a 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -279,7 +279,7 @@ KDE_EXPORT int kdemain( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ),
 	I18N_NOOP( "TWin helper utility" ), "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     bool id_ok = false;
     Window id = args->getOption( "wid" ).toULong( &id_ok );
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index 46969da7f..87f4c8b50 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -49,7 +49,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ),
 	I18N_NOOP( "TWin helper utility" ), "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString hostname = args->getOption( "hostname" );
     bool pid_ok = false;
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 95e297bc2..a08d5a209 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -803,7 +803,7 @@ void KCommonDecoration::updateWindowShape()
 
     bool tl=true,tr=true,bl=true,br=true; // is there a transparent rounded corner in top-left? etc
 
-    TQDesktopWidget *desktop=KApplication::desktop();
+    TQDesktopWidget *desktop=TDEApplication::desktop();
     // no transparent rounded corners if this window corner lines up with a screen corner
     for(int screen=0; screen < desktop->numScreens(); ++screen)
     {
diff --git a/twin/main.cpp b/twin/main.cpp
index df2470c3e..d53578caf 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -82,7 +82,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
     }
 
 Application::Application( )
-: KApplication( ), owner( screen_number )
+: TDEApplication( ), owner( screen_number )
     {
 #ifdef USE_QT4
     // I'm special...
@@ -216,7 +216,7 @@ bool Application::x11EventFilter( XEvent *e )
     {
     if ( Workspace::self()->workspaceEvent( e ) )
              return TRUE;
-    return KApplication::x11EventFilter( e );
+    return TDEApplication::x11EventFilter( e );
     }
     
 static void sighandler(int) 
@@ -327,7 +327,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     if (signal(SIGHUP, KWinInternal::sighandler) == SIG_IGN)
         signal(SIGHUP, SIG_IGN);
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     KWinInternal::Application a;
     KWinInternal::SessionManaged weAreIndeed;
     KWinInternal::SessionSaveDoneHelper helper;
diff --git a/twin/main.h b/twin/main.h
index 5ac38a61a..92823d74a 100644
--- a/twin/main.h
+++ b/twin/main.h
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 namespace KWinInternal
 {
 
-class Application : public  KApplication
+class Application : public  TDEApplication
     {
     Q_OBJECT
     public:
diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp
index 0b9c199cd..96c94288d 100644
--- a/twin/resumer/resumer.cpp
+++ b/twin/resumer/resumer.cpp
@@ -48,7 +48,7 @@ int main( int argc, char* argv[] )
     TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ),
 	I18N_NOOP( "TWin helper utility" ), "1.0" );
     TDECmdLineArgs::addCmdLineOptions( options );
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString hostname = args->getOption( "hostname" );
     bool pid_ok = false;
diff --git a/twin/rules.cpp b/twin/rules.cpp
index f3479f48f..6d2d66906 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app )
     args << "--wid" << TQString::number( c->window());
     if( whole_app )
         args << "--whole-app";
-    KApplication::tdeinitExec( "twin_rules_dialog", args );
+    TDEApplication::tdeinitExec( "twin_rules_dialog", args );
     }
 
 void Workspace::loadWindowRules()
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 2537d9f6b..4734da33c 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -100,7 +100,7 @@ void DecoBenchApplication::executeTest()
 int main(int argc, char** argv)
 {
 	TQString style = "keramik";
-	// KApplication app(argc, argv);
+	// TDEApplication app(argc, argv);
 	KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl");
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/twin/tools/decobenchmark/main.h b/twin/tools/decobenchmark/main.h
index 65c0c78ae..e556c1350 100644
--- a/twin/tools/decobenchmark/main.h
+++ b/twin/tools/decobenchmark/main.h
@@ -29,7 +29,7 @@ enum Tests {
 	RecreationTest
 };
 
-class DecoBenchApplication : public KApplication
+class DecoBenchApplication : public TDEApplication
 {
 	Q_OBJECT
 public:
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index cc109918c..16f722634 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -999,7 +999,7 @@ void Workspace::reconfigure()
 void Workspace::slotSettingsChanged(int category)
     {
     kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl;
-    if( category == (int) KApplication::SETTINGS_SHORTCUTS )
+    if( category == (int) TDEApplication::SETTINGS_SHORTCUTS )
         readShortcuts();
     }
 
@@ -1220,7 +1220,7 @@ TQStringList Workspace::configModules(bool controlCenter)
 
 void Workspace::configureWM()
     {
-    KApplication::tdeinitExec( "kcmshell", configModules(false) );
+    TDEApplication::tdeinitExec( "kcmshell", configModules(false) );
     }
 
 /*!