diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:53:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:53:43 -0600 |
| commit | 8d234817c36d029c8354600754051de394c4a27d (patch) | |
| tree | 2f6f343c03891b87e2bc326e6f49dbaa32f28ef4 | |
| parent | 25f26fa3bcfc6fd8519c76d6ab0a2fd37d5c637f (diff) | |
| download | knemo-8d234817c36d029c8354600754051de394c4a27d.tar.gz knemo-8d234817c36d029c8354600754051de394c4a27d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | src/knemod/interfacetray.cpp | 6 | ||||
| -rw-r--r-- | src/knemod/knemodaemon.cpp | 2 | ||||
| -rw-r--r-- | src/knemod/knemodaemon.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/knemod/interfacetray.cpp b/src/knemod/interfacetray.cpp index 1dbf820..d816f01 100644 --- a/src/knemod/interfacetray.cpp +++ b/src/knemod/interfacetray.cpp @@ -94,8 +94,8 @@ void InterfaceTray::mousePressEvent( TQMouseEvent* e ) void InterfaceTray::showAboutDialog() { - KAboutData data ( "knemo", I18N_NOOP( "KNemo" ), version, - description, KAboutData::License_GPL, + TDEAboutData data ( "knemo", I18N_NOOP( "KNemo" ), version, + description, TDEAboutData::License_GPL, "(c) 2004, 2005, 2006 Percy Leonhardt\n\nSignal plotter taken from KSysGuard\n(c) 1999 - 2002, Chris Schlaeger", 0, "http://extragear.kde.org/apps/knemo/" @@ -114,7 +114,7 @@ void InterfaceTray::showAboutDialog() void InterfaceTray::showReportBugDialog() { - KAboutData data ( "knemo", I18N_NOOP( "KNemo" ), version ); + TDEAboutData data ( "knemo", I18N_NOOP( "KNemo" ), version ); KBugReport bugReport( 0, true, &data ); bugReport.exec(); } diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp index 030494a..add12c8 100644 --- a/src/knemod/knemodaemon.cpp +++ b/src/knemod/knemodaemon.cpp @@ -49,7 +49,7 @@ KNemoDaemon::KNemoDaemon( const TQCString& name ) mColorIncoming( 0x1889FF ), mColorOutgoing( 0xFF7F08 ), mColorBackground( 0x313031 ), - mInstance( new KInstance( "knemo" ) ), + mInstance( new TDEInstance( "knemo" ) ), mNotifyInstance( new KNotifyClient::Instance( mInstance ) ) { KGlobal::locale()->insertCatalogue( "knemod" ); diff --git a/src/knemod/knemodaemon.h b/src/knemod/knemodaemon.h index ca0241d..d156bfa 100644 --- a/src/knemod/knemodaemon.h +++ b/src/knemod/knemodaemon.h @@ -32,7 +32,7 @@ #include "global.h" class TQTimer; -class KInstance; +class TDEInstance; class Interface; class BackendBase; class KNotifyClient::Instance; @@ -103,7 +103,7 @@ private: // gather new informations from the backend TQTimer* mPollTimer; // our own instance - KInstance* mInstance; + TDEInstance* mInstance; // needed so that KNotifyClient::event will work KNotifyClient::Instance* mNotifyInstance; // application wide settings are stored here |