summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:53:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:53:39 -0600
commit009812cf948ff581255adccf26a5c32646c3c164 (patch)
tree204106d8898b13727262c3c76bf4a391ed67537a
parentcd0aa1fec79f1b5210a2ed55afd5a205325c9d03 (diff)
downloadgtk-qt-engine-009812cf948ff581255adccf26a5c32646c3c164.tar.gz
gtk-qt-engine-009812cf948ff581255adccf26a5c32646c3c164.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--kcm_gtk/kcmgtk.cpp4
-rw-r--r--src/qt_qt_wrapper.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 752a955..2a39d6d 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -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()));
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index ff49696..4ef9672 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -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;
}