Rename common header files for consistency with class renaming

13 files changed, 16 insertions, 16 deletions

diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h
index 52d18291b..d6be130aa 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/kstyles/asteroid/asteroid.h
@@ -7,7 +7,7 @@
 #ifndef __ASTEROID_H
 #define __ASTEROID_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 class AsteroidStyle : public TDEStyle
 {
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 33ded2d17..7fa618a92 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -34,7 +34,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 enum GradientType{ VSmall=0, VMed, VLarge, HMed, HLarge, GradientCount };
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index 0b2e677b1..af021a91a 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -776,7 +776,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 			break;
 		}
 		case KPE_ListViewBranch: 
-			// TODO Draw (thick) dotted line. Check kstyle.cpp
+			// TODO Draw (thick) dotted line. Check tdestyle.cpp
 			// Fall down for now
 		default:
 			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
@@ -1194,7 +1194,7 @@ void HighContrastStyle::drawControlMask (TQ_ControlElement element,
 }
 
 // Helper to find the next sibling that's not hidden
-// Lifted from kstyle.cpp
+// Lifted from tdestyle.cpp
 static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
 {
     TQListViewItem* sibling = item;
@@ -1329,7 +1329,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 		// -------------------------------------------------------------------
 		case CC_ListView: {
 			/*
-			 * Sigh... Lifted and modified from kstyle.cpp 
+			 * Sigh... Lifted and modified from tdestyle.cpp 
 			 */
 			/* 
 			 * Many thanks to TrollTech AS for donating CC_ListView from TQWindowsStyle.
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 1a721e8c6..552526254 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -41,7 +41,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 class TQPopupMenu;
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 02ec9499e..7bf8cd3d4 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -33,7 +33,7 @@
 #define __keramik_h__
 
 #include <tqframe.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 #include "pixmaploader.h"
 
diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h
index ee3cecfe5..f82fd5d0a 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/kstyles/klegacy/klegacystyle.h
@@ -25,7 +25,7 @@
 #ifndef   __KLegacyStyle_hh
 #define   __KLegacyStyle_hh
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 // forward declaration
 class KLegacyStylePrivate;
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index faef98dfd..1e16bcee7 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -34,7 +34,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
 #include <kpixmap.h>
 #include <tqintcache.h>
 #include <tqstring.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqsettings.h>
 #include <tqpalette.h> // for QColorGroup
 #include "kstyledirs.h"
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 75d096a4b..90b3e89c9 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -24,7 +24,7 @@
 #define LIGHTSTYLE_V2_H
 
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 #ifdef QT_PLUGIN
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index 7ce62c3a8..0330c8f87 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -28,7 +28,7 @@
 #include <tqcommonstyle.h>
 #endif // QT_H
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #ifdef QT_PLUGIN
 #  define Q_EXPORT_STYLE_LIGHT_V3
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 7c3e0484b..68f707d79 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -39,7 +39,7 @@
 #ifndef __PLASTIK_H
 #define __PLASTIK_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbitmap.h>
 #include <tqintcache.h>
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 67e29f706..274c2d335 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -25,8 +25,8 @@
 #include <tqstringlist.h>
 #include <tqsettings.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index aca43fb74..d96688ee0 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -32,7 +32,7 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdrawutil.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h
index 68f83c99b..0e4c59dbd 100644
--- a/kstyles/web/webstyle.h
+++ b/kstyles/web/webstyle.h
@@ -20,7 +20,7 @@
 #ifndef WEB_STYLE_H
 #define WEB_STYLE_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqpalette.h>
 
 class TQPainter;