diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
| commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
| tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kpdf | |
| parent | e5ce3b4175f2e72788b49b9ed46c722784218dad (diff) | |
| download | tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kpdf')
| -rw-r--r-- | kpdf/part.cpp | 4 | ||||
| -rw-r--r-- | kpdf/part.h | 4 | ||||
| -rw-r--r-- | kpdf/shell/main.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 1ceb042d..9b798526 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -383,12 +383,12 @@ KURL Part::currentDocument() } //this don't go anywhere but is required by genericfactory.h -KAboutData* Part::createAboutData() +TDEAboutData* Part::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("kpdfpart", I18N_NOOP("KPDF::Part"), "0.1"); + TDEAboutData* aboutData = new TDEAboutData("kpdfpart", I18N_NOOP("KPDF::Part"), "0.1"); aboutData->addAuthor("Wilco Greven", 0, "greven@kde.org"); return aboutData; } diff --git a/kpdf/part.h b/kpdf/part.h index a561326a..eec74710 100644 --- a/kpdf/part.h +++ b/kpdf/part.h @@ -33,7 +33,7 @@ class KConfig; class KDirWatch; class KToggleAction; class KSelectAction; -class KAboutData; +class TDEAboutData; class KPrinter; class ThumbnailList; @@ -73,7 +73,7 @@ public: uint observerId() const { return PART_ID; } void notifyViewportChanged( bool smoothMove ); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); ASYNC goToPage(uint page); ASYNC openDocument(KURL doc); diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp index 5009ba12..5d8f0be0 100644 --- a/kpdf/shell/main.cpp +++ b/kpdf/shell/main.cpp @@ -31,12 +31,12 @@ static KCmdLineOptions options[] = int main(int argc, char** argv) { - KAboutData about( + TDEAboutData about( "kpdf", I18N_NOOP("KPDF"), version, description, - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2002 Wilco Greven, Christophe Devriese\n(C) 2004-2005 Albert Astals Cid, Enrico Ros"); about.addAuthor("Wilco Greven", 0, "greven@kde.org"); |