Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 545d48dc2a
commit 59ea7131b3

@ -56,7 +56,7 @@ Kodometer::Kodometer(TQWidget* parent, const char* name)
pollInterval(10), pollInterval(10),
saveFrequency(10) saveFrequency(10)
{ {
display = KApplication::kApplication()->getDisplay(); display = TDEApplication::kApplication()->getDisplay();
FindAllScreens(); FindAllScreens();
root = RootWindow(display, DefaultScreen(display)); root = RootWindow(display, DefaultScreen(display));

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
aboutData.addCredit("Daniel Teske", I18N_NOOP("Many patches"), "teske@bigfoot.com"); aboutData.addCredit("Daniel Teske", I18N_NOOP("Many patches"), "teske@bigfoot.com");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app; TDEApplication app;
TopLevel toplevel; TopLevel toplevel;
KWin::setSystemTrayWindowFor(toplevel.winId(), 0); KWin::setSystemTrayWindowFor(toplevel.winId(), 0);

@ -182,7 +182,7 @@ TopLevel::TopLevel() : KSystemTray()
stop(); // reset timer, disable some menu entries, etc. stop(); // reset timer, disable some menu entries, etc.
} }
/* slot: signal shutDown() from KApplication */ /* slot: signal shutDown() from TDEApplication */
/* (not currently needed) /* (not currently needed)
void TopLevel::queryExit() void TopLevel::queryExit()
{ {

@ -21,7 +21,7 @@ int SpriteRange::random() const
if (mMax != mMin) if (mMax != mMin)
{ {
val = (KApplication::random()%(mMax-mMin)) + mMin; val = (TDEApplication::random()%(mMax-mMin)) + mMin;
} }
return val; return val;

@ -101,7 +101,7 @@ void kweather::initContextMenu()
void kweather::initDCOP() void kweather::initDCOP()
{ {
if ( !mClient ) if ( !mClient )
mClient = KApplication::dcopClient(); mClient = TDEApplication::dcopClient();
if(!mClient->isAttached()) if(!mClient->isAttached())
mClient->attach(); mClient->attach();
@ -388,7 +388,7 @@ bool kweather::attach()
{ {
kdDebug(12004) << "Could not find service so I am starting it..." kdDebug(12004) << "Could not find service so I am starting it..."
<< endl; << endl;
if (!KApplication::startServiceByDesktopName("kweatherservice", if (!TDEApplication::startServiceByDesktopName("kweatherservice",
TQStringList(), &error)) TQStringList(), &error))
{ {
kdDebug(12004) << "Starting KWeatherService failed with message: " kdDebug(12004) << "Starting KWeatherService failed with message: "

@ -37,14 +37,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
return -1; return -1;
} }
KApplication app; TDEApplication app;
DCOPClient *client = app.dcopClient(); DCOPClient *client = app.dcopClient();
client->attach(); client->attach();
TQString error; TQString error;
if (!client->isApplicationRegistered("KWeatherService")) if (!client->isApplicationRegistered("KWeatherService"))
{ {
if (KApplication::startServiceByDesktopName("kweatherservice", if (TDEApplication::startServiceByDesktopName("kweatherservice",
TQStringList(), &error)) TQStringList(), &error))
{ {
kdDebug() << "Starting kweatherservice failed: " << error << endl; kdDebug() << "Starting kweatherservice failed: " << error << endl;

@ -208,7 +208,7 @@ bool ServiceConfigWidget::dcopActive()
bool isGood = true; bool isGood = true;
DCOPClient *client = kapp->dcopClient(); DCOPClient *client = kapp->dcopClient();
if ( !client->isApplicationRegistered( "KWeatherService" ) ) { if ( !client->isApplicationRegistered( "KWeatherService" ) ) {
if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) )
isGood = false; isGood = false;
} }

@ -42,7 +42,7 @@ WeatherButton::WeatherButton( TQWidget *parent, const char *name )
kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::SettingsChanged );
kapp->addKipcEventMask( KIPC::IconChanged ); kapp->addKipcEventMask( KIPC::IconChanged );
slotSettingsChanged( KApplication::SETTINGS_MOUSE ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
} }
void WeatherButton::drawButton( TQPainter *p ) void WeatherButton::drawButton( TQPainter *p )
@ -108,7 +108,7 @@ void WeatherButton::generateIcons()
void WeatherButton::slotSettingsChanged( int category ) void WeatherButton::slotSettingsChanged( int category )
{ {
if ( category != KApplication::SETTINGS_MOUSE ) return; if ( category != TDEApplication::SETTINGS_MOUSE ) return;
bool changeCursor = KGlobalSettings::changeCursorOverIcon(); bool changeCursor = KGlobalSettings::changeCursorOverIcon();

Loading…
Cancel
Save