Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent cd0aa1fec7
commit 009812cf94

@ -195,9 +195,9 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
load();
// Connect some signals
connect(widget->warning2, TQT_SIGNAL(leftClickedURL(const TQString&)), KApplication::kApplication(), TQT_SLOT(invokeBrowser(const TQString&)));
connect(widget->warning2, TQT_SIGNAL(leftClickedURL(const TQString&)), TDEApplication::kApplication(), TQT_SLOT(invokeBrowser(const TQString&)));
connect(widget->styleGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(itemChanged()));
connect(widget->warning5, TQT_SIGNAL(leftClickedURL(const TQString&)), KApplication::kApplication(), TQT_SLOT(invokeBrowser(const TQString&)));
connect(widget->warning5, TQT_SIGNAL(leftClickedURL(const TQString&)), TDEApplication::kApplication(), TQT_SLOT(invokeBrowser(const TQString&)));
connect(widget->styleGroup3, TQT_SIGNAL(clicked(int)), TQT_SLOT(itemChanged()));
connect(widget->fontGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(itemChanged()));
connect(widget->styleBox, TQT_SIGNAL(activated(int)), TQT_SLOT(itemChanged()));

@ -166,7 +166,7 @@ void createTQApp()
{
int argc = 1;
char** argv;
// Supply it with fake data to keep KApplication happy
// Supply it with fake data to keep TDEApplication happy
argv = (char**) malloc(sizeof(char*));
argv[0] = (char*) malloc(sizeof(char) * 19);
strncpy(argv[0], "gtk-qt-application", 19);
@ -177,7 +177,7 @@ void createTQApp()
"message goes here", 0 /* TODO: Website */, "kb9vqf@pearsoncomputing.net");
TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
TQString cmdLine;
@ -374,7 +374,7 @@ void createTQApp()
if (!tqApp)
{
new KApplication(gdk_x11_get_default_xdisplay(), true, 0, 0, true);
new TDEApplication(gdk_x11_get_default_xdisplay(), true, 0, 0, true);
tqAppOwner = true;
}

Loading…
Cancel
Save