diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /klipper/toplevel.h | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'klipper/toplevel.h')
| -rw-r--r-- | klipper/toplevel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/klipper/toplevel.h b/klipper/toplevel.h index 024fb87f7..59d7c7396 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -31,7 +31,7 @@ class TQClipboard; class KToggleAction; -class KAboutData; +class TDEAboutData; class URLGrabber; class ClipboardPoll; class TQTime; @@ -69,7 +69,7 @@ public: static void updateTimestamp(); static void createAboutData(); static void destroyAboutData(); - static KAboutData* aboutData(); + static TDEAboutData* aboutData(); public slots: void saveSession(); @@ -204,7 +204,7 @@ private: TQTimer m_pendingCheckTimer; bool m_pendingContentsCheck; ClipboardPoll* poll; - static KAboutData* about_data; + static TDEAboutData* about_data; bool blockFetchingNewData(); KlipperSessionManaged* session_managed; |