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 | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'klipper')
| -rw-r--r-- | klipper/toplevel.cpp | 8 | ||||
| -rw-r--r-- | klipper/toplevel.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 8e5e0df08..b16f5086f 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -1102,8 +1102,8 @@ static const char * const description = void KlipperWidget::createAboutData() { - about_data = new KAboutData("klipper", I18N_NOOP("Klipper"), - klipper_version, description, KAboutData::License_GPL, + about_data = new TDEAboutData("klipper", I18N_NOOP("Klipper"), + klipper_version, description, TDEAboutData::License_GPL, "(c) 1998, Andrew Stanley-Jones\n" "1998-2002, Carsten Pfeiffer\n" "2001, Patrick Dubroy"); @@ -1135,9 +1135,9 @@ void KlipperWidget::destroyAboutData() about_data = NULL; } -KAboutData* KlipperWidget::about_data; +TDEAboutData* KlipperWidget::about_data; -KAboutData* KlipperWidget::aboutData() +TDEAboutData* KlipperWidget::aboutData() { return about_data; } 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; |