summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:14:48 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:14:48 -0500
commitdad42352f4ad47d34caf50040367dc2a95772baa (patch)
tree6d2887d13f9b1403b8ce15be48a6ea7cec32fd96 /tdecore
parent365f03061337a81bcffb4a45c4ad637edad27019 (diff)
downloadtdelibs-dad42352f4ad47d34caf50040367dc2a95772baa.tar.gz
tdelibs-dad42352f4ad47d34caf50040367dc2a95772baa.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/tdeapplication.h2
-rw-r--r--tdecore/tdelibs_export.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 22c43bdc1..f2f776a2f 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -893,7 +893,7 @@ public:
/**
* @deprecated
*/
- KDE_DEPRECATED TDEStyle* kstyle() const { return 0; }
+ KDE_DEPRECATED TDEStyle* tdestyle() const { return 0; }
/**
* Builds a caption that contains the application name along with the
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 46b36f1d8..e59837feb 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -45,7 +45,7 @@
#define TDESU_EXPORT KDE_EXPORT
#define KVCARD_EXPORT KDE_EXPORT
#define TDERESOURCES_EXPORT KDE_EXPORT
-#define KSTYLE_EXPORT KDE_EXPORT
+#define TDESTYLE_EXPORT KDE_EXPORT
#define TDEHTML_EXPORT KDE_EXPORT
#define KMDI_EXPORT KDE_EXPORT
#define KUTILS_EXPORT KDE_EXPORT