diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kcontrol/konq | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konq')
| -rw-r--r-- | kcontrol/konq/desktopbehavior_impl.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/fontopts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/main.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konq/rootopts.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index a66597f8d..307a04a6d 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -400,7 +400,7 @@ void DesktopBehavior::save() kapp->dcopClient()->attach(); TQByteArray data; - int konq_screen_number = KApplication::desktop()->primaryScreen(); + int konq_screen_number = TDEApplication::desktop()->primaryScreen(); TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 07ee4663e..37ab6f71c 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -335,7 +335,7 @@ void KonqFontOptions::save() kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); // Tell kdesktop about the new config file - int konq_screen_number = KApplication::desktop()->primaryScreen(); + int konq_screen_number = TDEApplication::desktop()->primaryScreen(); TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index e79fbd9ce..e0a0d0780 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -35,7 +35,7 @@ static TQCString configname() { - int desktop = KApplication::desktop()->primaryScreen(); + int desktop = TDEApplication::desktop()->primaryScreen(); TQCString name; if (desktop == 0) name = "kdesktoprc"; diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 4110762cb..589ad0e3a 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -251,7 +251,7 @@ void DesktopPathConfig::save() if (pathChanged) { kdDebug() << "DesktopPathConfig::save sending message SettingsChanged" << endl; - KIPC::sendMessageAll(KIPC::SettingsChanged, KApplication::SETTINGS_PATHS); + KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS); } // Tell kdesktop about the new config file @@ -259,7 +259,7 @@ void DesktopPathConfig::save() kapp->dcopClient()->attach(); TQByteArray data; - int konq_screen_number = KApplication::desktop()->primaryScreen(); + int konq_screen_number = TDEApplication::desktop()->primaryScreen(); TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; |