diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kuiviewer | |
parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kuiviewer')
-rw-r--r-- | kuiviewer/kuiviewer_part.cpp | 6 | ||||
-rw-r--r-- | kuiviewer/kuiviewer_part.h | 4 | ||||
-rw-r--r-- | kuiviewer/main.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index bd87a6ee..87b332ed 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -111,14 +111,14 @@ KUIViewerPart::~KUIViewerPart() { } -KAboutData *KUIViewerPart::createAboutData() +TDEAboutData *KUIViewerPart::createAboutData() { // the non-i18n name here must be the same as the directory in // which the part's rc file is installed ('partrcdir' in the // Makefile) - KAboutData *aboutData = new KAboutData("kuiviewerpart", I18N_NOOP("KUIViewerPart"), "0.1", + TDEAboutData *aboutData = new TDEAboutData("kuiviewerpart", I18N_NOOP("KUIViewerPart"), "0.1", I18N_NOOP("Displays Designer's UI files"), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData->addAuthor("Richard Moore", 0, "rich@kde.org"); aboutData->addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org"); return aboutData; diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h index 644db709..779a51cd 100644 --- a/kuiviewer/kuiviewer_part.h +++ b/kuiviewer/kuiviewer_part.h @@ -28,7 +28,7 @@ class TQWidget; class KURL; class TQVBox; -class KAboutData; +class TDEAboutData; class KListAction; class KListView; @@ -56,7 +56,7 @@ public: */ virtual ~KUIViewerPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); public slots: bool openURL( const KURL& ); diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp index 998c539c..e7a0396f 100644 --- a/kuiviewer/main.cpp +++ b/kuiviewer/main.cpp @@ -40,9 +40,9 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1", + TDEAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1", I18N_NOOP("Displays Designer's UI files"), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); about.addAuthor("Richard Moore", 0, "rich@kde.org"); about.addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org"); // Screenshot capability |