diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-03 23:01:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-03 23:01:18 -0600 |
| commit | aa3abfa2a78cccfcb1f91d808753c79295d618e9 (patch) | |
| tree | fe00218b08a670818d7ee67e677d1f6b5ded6eed /tdecore | |
| parent | e92a4e05c504978308b2dd83082d2727b74bea8f (diff) | |
| download | tdelibs-aa3abfa2a78cccfcb1f91d808753c79295d618e9.tar.gz tdelibs-aa3abfa2a78cccfcb1f91d808753c79295d618e9.zip | |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kapplication.cpp | 2 | ||||
| -rw-r--r-- | tdecore/kapplication.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 968664bad..57f3a3811 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -2277,7 +2277,7 @@ void TDEApplication::applyGUIStyle() if ( !useStyles ) return; TDEConfigGroup pConfig (TDEGlobal::config(), "General"); - TQString defaultStyle = KStyle::defaultStyle(); + TQString defaultStyle = TDEStyle::defaultStyle(); TQString styleStr = pConfig.readEntry("widgetStyle", defaultStyle); if (d->overrideStyle.isEmpty()) { diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index 4b29dd94c..93092e53e 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -45,7 +45,7 @@ struct _IceConn; class TQPopupMenu; class TQStrList; class KSessionManaged; -class KStyle; +class TDEStyle; class KURL; #define kapp TDEApplication::kApplication() @@ -872,7 +872,7 @@ public: /** * @deprecated */ - KDE_DEPRECATED KStyle* kstyle() const { return 0; } + KDE_DEPRECATED TDEStyle* kstyle() const { return 0; } /** * Builds a caption that contains the application name along with the |