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 /konsole | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'konsole')
| -rw-r--r-- | konsole/konsole/konsole.cpp | 4 | ||||
| -rw-r--r-- | konsole/konsole/main.cpp | 6 | ||||
| -rw-r--r-- | konsole/konsole/schema.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 87ad18e20..3d5ad49cb 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -316,7 +316,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (isRestored) { n_tabbar = wanted_tabbar; - KConfig *c = KApplication::kApplication()->sessionConfig(); + KConfig *c = TDEApplication::kApplication()->sessionConfig(); // c->setDesktopGroup(); // Reads from wrong group b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false); } @@ -2073,7 +2073,7 @@ void Konsole::slotConfigure() { TQStringList args; args << "kcmkonsole"; - KApplication::tdeinitExec( "kcmshell", args ); + TDEApplication::tdeinitExec( "kcmshell", args ); } void Konsole::reparseConfiguration() diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index d82942ee7..f8859da75 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -247,12 +247,12 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) if( qtargs->isSet("font") ) kdWarning() << "The Qt option -fn, --font has no effect." << endl; - KApplication* a = NULL; + TDEApplication* a = NULL; #ifdef COMPOSITE - a = new KApplication(KApplication::openX11RGBADisplay()); + a = new TDEApplication(TDEApplication::openX11RGBADisplay()); argb_visual = a->isX11CompositionAvailable(); #else - a = new KApplication; + a = new TDEApplication; #endif TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/"); diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8d85329eb..fc31980a2 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -356,7 +356,7 @@ bool ColorSchema::rereadSchemaFile() continue; if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (random_hue == -1) - random_hue = (KApplication::random()%32) * 11; + random_hue = (TDEApplication::random()%32) * 11; ch = random_hue; if (!(0 <= cs && cs <= 255 )) continue; if (!(0 <= cv && cv <= 255 )) continue; |