Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 4b5c71fdde
commit 8f06b9a888

@ -22,7 +22,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication kapplication; TDEApplication kapplication;
if (kapplication.isRestored()) if (kapplication.isRestored())
RESTORE(AtlanticDesigner) RESTORE(AtlanticDesigner)

@ -28,7 +28,7 @@
#ifndef _LNKFORWARDER_H_ #ifndef _LNKFORWARDER_H_
#define _LNKFORWARDER_H_ #define _LNKFORWARDER_H_
class LNKForwarder : public KApplication class LNKForwarder : public TDEApplication
{ {
Q_OBJECT Q_OBJECT

@ -180,7 +180,7 @@ void KBinaryClock::loadSettings(){
int darkFactor = prefs->darkFactor(); int darkFactor = prefs->darkFactor();
TQColor backgroundColor = prefs->background(); TQColor backgroundColor = prefs->background();
bool modifyBackground = false; bool modifyBackground = false;
if(backgroundColor != KApplication::palette().active().background()){ if(backgroundColor != TDEApplication::palette().active().background()){
setPaletteBackgroundColor(backgroundColor); setPaletteBackgroundColor(backgroundColor);
modifyBackground = true; modifyBackground = true;
} }

@ -35,7 +35,7 @@
</entry> </entry>
<entry name="Background" type="Color"> <entry name="Background" type="Color">
<label>Background color</label> <label>Background color</label>
<default code="true">KApplication::palette().active().background()</default> <default code="true">TDEApplication::palette().active().background()</default>
</entry> </entry>
<entry name="Show_Seconds" type="Bool"> <entry name="Show_Seconds" type="Bool">
<label>Whether to show seconds</label> <label>Whether to show seconds</label>

@ -47,7 +47,7 @@ SimpleButton::SimpleButton(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 SimpleButton::setPixmap(const TQPixmap &pix) void SimpleButton::setPixmap(const TQPixmap &pix)
@ -142,7 +142,7 @@ void SimpleButton::generateIcons()
void SimpleButton::slotSettingsChanged(int category) void SimpleButton::slotSettingsChanged(int category)
{ {
if (category != KApplication::SETTINGS_MOUSE) if (category != TDEApplication::SETTINGS_MOUSE)
{ {
return; return;
} }

@ -26,7 +26,7 @@ PlayerInterface::~PlayerInterface() { } // Destructor
void PlayerInterface::startPlayer(const TQString &desktopname) void PlayerInterface::startPlayer(const TQString &desktopname)
{ {
if (KApplication::startServiceByDesktopName(desktopname, TQStringList(), if (TDEApplication::startServiceByDesktopName(desktopname, TQStringList(),
0, 0, 0, "", false) > 0) 0, 0, 0, "", false) > 0)
{ {
KMessageBox::error(0, i18n("Could not start media player.")); KMessageBox::error(0, i18n("Could not start media player."));

@ -47,7 +47,7 @@ SimpleButton::SimpleButton(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 SimpleButton::setPixmap(const TQPixmap &pix) void SimpleButton::setPixmap(const TQPixmap &pix)
@ -142,7 +142,7 @@ void SimpleButton::generateIcons()
void SimpleButton::slotSettingsChanged(int category) void SimpleButton::slotSettingsChanged(int category)
{ {
if (category != KApplication::SETTINGS_MOUSE) if (category != TDEApplication::SETTINGS_MOUSE)
{ {
return; return;
} }

@ -428,7 +428,7 @@ void FSView::saveFSOptions()
void FSView::quit() void FSView::quit()
{ {
saveFSOptions(); saveFSOptions();
KApplication::kApplication()->quit(); TDEApplication::kApplication()->quit();
} }
void FSView::doRedraw() void FSView::doRedraw()

@ -144,7 +144,7 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()),
TQT_SLOT (slotShowColorMenu())); TQT_SLOT (slotShowColorMenu()));
slotSettingsChanged(KApplication::SETTINGS_MOUSE); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
if (kapp) if (kapp)
connect( kapp, TQT_SIGNAL( settingsChanged(int) ), connect( kapp, TQT_SIGNAL( settingsChanged(int) ),
TQT_SLOT( slotSettingsChanged(int) ) ); TQT_SLOT( slotSettingsChanged(int) ) );
@ -178,7 +178,7 @@ FSViewPart::~FSViewPart()
void FSViewPart::slotSettingsChanged(int category) void FSViewPart::slotSettingsChanged(int category)
{ {
if (category != KApplication::SETTINGS_MOUSE) return; if (category != TDEApplication::SETTINGS_MOUSE) return;
TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)),
_ext,TQT_SLOT(selected(TreeMapItem*))); _ext,TQT_SLOT(selected(TreeMapItem*)));
@ -206,7 +206,7 @@ void FSViewPart::showInfo()
void FSViewPart::showHelp() void FSViewPart::showHelp()
{ {
KApplication::startServiceByDesktopName("khelpcenter", TDEApplication::startServiceByDesktopName("khelpcenter",
TQString("help:/konq-plugins/fsview/index.html")); TQString("help:/konq-plugins/fsview/index.html"));
} }

@ -29,7 +29,7 @@ int main(int argc, char* argv[])
I18N_NOOP("(c) 2002, Josef Weidendorfer")); I18N_NOOP("(c) 2002, Josef Weidendorfer"));
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication a; TDEApplication a;
KConfigGroup gconfig(KGlobal::config(), TQCString("General")); KConfigGroup gconfig(KGlobal::config(), TQCString("General"));
TQString path = gconfig.readPathEntry("Path", "."); TQString path = gconfig.readPathEntry("Path", ".");

@ -285,7 +285,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
KURIFilter::self()->filterURI( data, list ); KURIFilter::self()->filterURI( data, list );
} }
if(KApplication::keyboardMouseState() & TQt::ControlButton) if(TDEApplication::keyboardMouseState() & TQt::ControlButton)
{ {
KParts::URLArgs args; KParts::URLArgs args;
args.setNewTab(true); args.setNewTab(true);

@ -126,7 +126,7 @@ namespace KSB_News {
int err = 0; int err = 0;
if (! kapp->dcopClient()->isApplicationRegistered("rssservice")) if (! kapp->dcopClient()->isApplicationRegistered("rssservice"))
if (KApplication::startServiceByDesktopName("rssservice", TQString(), if (TDEApplication::startServiceByDesktopName("rssservice", TQString(),
&rdfservice_error) > 0) &rdfservice_error) > 0)
err = 1; err = 1;

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if(args->isSet("random") || args->isSet("daily")) { if(args->isSet("random") || args->isSet("daily")) {
KApplication a(false, false); TDEApplication a(false, false);
SigGenerator generator; SigGenerator generator;
TQTextStream output(stdout, IO_WriteOnly); TQTextStream output(stdout, IO_WriteOnly);
@ -59,7 +59,7 @@ int main(int argc, char *argv[])
return(0); return(0);
} }
else { else {
KApplication a; TDEApplication a;
KSig *ksig = new KSig(); KSig *ksig = new KSig();
a.setMainWidget(ksig); a.setMainWidget(ksig);

@ -55,7 +55,7 @@ TQString SigGenerator::random() const
if(signatures.count() <= 0) if(signatures.count() <= 0)
return(TQString()); return(TQString());
int i = KApplication::random() % signatures.count(); int i = TDEApplication::random() % signatures.count();
TQString text; TQString text;
SigListViewItem::nodeToText(signatures.item(i), text); SigListViewItem::nodeToText(signatures.item(i), text);

@ -577,7 +577,7 @@ int main(int argc, char **argv)
"charles@kde.org"); "charles@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app; TDEApplication app;
(new Control)->show(); (new Control)->show();

@ -99,8 +99,8 @@ void Madness::scopeEvent(float *d, int size)
int y=area.y(); int y=area.y();
int dx=(int)((delta*lightness*(area.height()/10)/100))*(KApplication::random()%2 ? -1 : 1); int dx=(int)((delta*lightness*(area.height()/10)/100))*(TDEApplication::random()%2 ? -1 : 1);
int dy=(int)((delta*lightness*(area.width()/10)/100))*(KApplication::random()%2 ? -1 : 1); int dy=(int)((delta*lightness*(area.width()/10)/100))*(TDEApplication::random()%2 ? -1 : 1);
if (dx < 0 && (x - dx < mWorkArea.left())) if (dx < 0 && (x - dx < mWorkArea.left()))
dx = -dx; dx = -dx;

@ -179,7 +179,7 @@ Item *RandomSelector::next()
for (int tries=15; tries; tries--) for (int tries=15; tries; tries--)
{ {
int randomIndex = KApplication::random() % (mTree->playableItemCount()); int randomIndex = TDEApplication::random() % (mTree->playableItemCount());
TreeItem *nowCurrent = randomItem(randomIndex, mTree->firstChild()); TreeItem *nowCurrent = randomItem(randomIndex, mTree->firstChild());
if (!nowCurrent) continue; if (!nowCurrent) continue;

Loading…
Cancel
Save