diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-03 22:57:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-03 22:57:16 -0600 |
| commit | 77ad361b74e6bda59916cc01c13c0b44306d730e (patch) | |
| tree | fdd22cb58a0d8cb733dc83d23cfe434a0a6af8e6 /sip/tdecore | |
| parent | 107a2e937c25407edfa880392ab957103adf286a (diff) | |
| download | pytde-77ad361b74e6bda59916cc01c13c0b44306d730e.tar.gz pytde-77ad361b74e6bda59916cc01c13c0b44306d730e.zip | |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdecore')
| -rw-r--r-- | sip/tdecore/kapplication.sip | 2 | ||||
| -rw-r--r-- | sip/tdecore/kdestyle.sip | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip index c626d3c..d13d156 100644 --- a/sip/tdecore/kapplication.sip +++ b/sip/tdecore/kapplication.sip @@ -205,7 +205,7 @@ public: static int tdeinitExecWait (const TQString&, const TQStringList&, TQString* /Out/, int*); TQString caption () const; -//ig KStyle* kstyle () const; +//ig TDEStyle* kstyle () const; TQString makeStdCaption (const TQString&, bool = 1, bool = 0) const; TQString tempSaveName (const TQString&) const; TQString checkRecoverFile (const TQString&, bool&) const; diff --git a/sip/tdecore/kdestyle.sip b/sip/tdecore/kdestyle.sip index a528ed2..a03617e 100644 --- a/sip/tdecore/kdestyle.sip +++ b/sip/tdecore/kdestyle.sip @@ -44,7 +44,7 @@ protected slots: }; // class KDEAniMenu -class KDEStyle : KStyle +class KDEStyle : TDEStyle { %TypeHeaderCode #include <kdestyle.h> |