Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 25f26fa3bc
commit 8d234817c3

@ -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();
}

@ -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" );

@ -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

Loading…
Cancel
Save