From ceaa36432c6b9733849fb795d2693f26b0cd0ba6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:53:40 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdegtk/tdegtk-theme.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp index cf32be6..e7e4af7 100644 --- a/tdegtk/tdegtk-theme.cpp +++ b/tdegtk/tdegtk-theme.cpp @@ -112,11 +112,11 @@ G_MODULE_EXPORT GtkThemingEngine* create_engine(void) { gtk3TQtEnable = true; gtk3TQtDebug = (getenv("GTK3_TQT_ENGINE_DEBUG") != NULL) ? 1 : 0; - DEBUG_PRINT("Creating KApplication") + DEBUG_PRINT("Creating TDEApplication") 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) * 21); strncpy(argv[0], "gtk3-tqt-application", 21); @@ -127,8 +127,8 @@ G_MODULE_EXPORT GtkThemingEngine* create_engine(void) { "", 0 /* TODO: Website */, "kb9vqf@pearsoncomputing.net"); TDECmdLineArgs::init(argc, const_cast(argv), &aboutData); - KApplication::disableAutoDcopRegistration(); - new KApplication(gdk_x11_get_default_xdisplay(), true, 0, 0, true); + TDEApplication::disableAutoDcopRegistration(); + new TDEApplication(gdk_x11_get_default_xdisplay(), true, 0, 0, true); // Propagate glib events to GTK as needed if (tqApp) { -- cgit v1.2.1