summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/kasbar
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kicker/extensions/kasbar
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kicker/extensions/kasbar')
-rw-r--r--kicker/extensions/kasbar/ChangeLog2
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index 0a899bd1d..8cbb33868 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -510,7 +510,7 @@
2003-08-07 Thursday 19:51 lunakl
* Rewrite handling of _NET_WM_ICON_NAME. This together with the
- recent KApplication change should hopefully make taskbar again
+ recent TDEApplication change should hopefully make taskbar again
display what it's supposed to display. Please yell if something
is still wrong.
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 34341cbfe..169fe5b52 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -78,7 +78,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue( "kasbarextension" );
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
kdDebug(1345) << "Kasbar starting..." << endl;
@@ -116,7 +116,7 @@ int main( int argc, char **argv )
KWin::setOnAllDesktops( kasbar->winId(), true );
kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;
- KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+ TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index c0a55753a..3a3a023fb 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -92,7 +92,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
detached_( false )
{
kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl;
-// KApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+// TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );