summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-14 17:03:48 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-14 17:03:48 -0600
commit81bd37998e37f44a4116df4ad17befab006c0fa5 (patch)
tree1869e3886845e999d7cf2cc0aca1b187dd06d6af
parentf57211d3eb8a0f2055bec901156c419141851df2 (diff)
downloadgtk-qt-engine-81bd37998e37f44a4116df4ad17befab006c0fa5.tar.gz
gtk-qt-engine-81bd37998e37f44a4116df4ad17befab006c0fa5.zip
Rename common header files for consistency with class renaming
-rw-r--r--kcm_gtk/kcmgtk.cpp2
-rw-r--r--kcm_gtk/kcmgtk.h2
-rw-r--r--src/qt_qt_wrapper.cpp6
-rw-r--r--src/qt_qt_wrapper.h2
-rw-r--r--src/qt_style.h2
-rw-r--r--src/qt_theme_draw.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp
index 92b2480..c713928 100644
--- a/kcm_gtk/kcmgtk.cpp
+++ b/kcm_gtk/kcmgtk.cpp
@@ -35,7 +35,7 @@
#include <tqradiobutton.h>
#include <tqlabel.h>
#include <kurllabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdefontcombo.h>
#include <tqspinbox.h>
#include <ksqueezedtextlabel.h>
diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h
index b3a2770..542a043 100644
--- a/kcm_gtk/kcmgtk.h
+++ b/kcm_gtk/kcmgtk.h
@@ -22,7 +22,7 @@
#define _KCMTEST_H_
#include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include "kcmgtkwidget.h"
#include "emacsdetails.h"
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index e1d6873..1d78036 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -19,9 +19,9 @@
#include <tqeventloop.h>
#include <kiconloader.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <tdeconfig.h>
#undef signals
diff --git a/src/qt_qt_wrapper.h b/src/qt_qt_wrapper.h
index d1bf80c..bda1a30 100644
--- a/src/qt_qt_wrapper.h
+++ b/src/qt_qt_wrapper.h
@@ -4,7 +4,7 @@
#include <gtk/gtknotebook.h>
#include <gdk/gdkgc.h>
-#include <gtk/gtkstyle.h>
+#include <gtk/gttdestyle.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkprogressbar.h>
diff --git a/src/qt_style.h b/src/qt_style.h
index 606f1bd..50c6bce 100644
--- a/src/qt_style.h
+++ b/src/qt_style.h
@@ -1,4 +1,4 @@
-#include <gtk/gtkstyle.h>
+#include <gtk/gttdestyle.h>
typedef struct _QtEngineStyle QtEngineStyle;
typedef struct _QtEngineStyleClass QtEngineStyleClass;
diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
index 20d8c87..d60783e 100644
--- a/src/qt_theme_draw.c
+++ b/src/qt_theme_draw.c
@@ -1631,7 +1631,7 @@ qtengine_style_init (QtEngineStyle *style)
}
-/* Copied these functions from gtkstyle.c
+/* Copied these functions from gttdestyle.c
Evil, evil GTK... why isn't this stuff exported? */
#define LIGHTNESS_MULT 1.3