summaryrefslogtreecommitdiffstats
path: root/kviewshell
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:18:35 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:18:35 -0600
commitf71394031a5e1c3b315081a98000f242b461ca8c (patch)
tree54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kviewshell
parente5ce3b4175f2e72788b49b9ed46c722784218dad (diff)
downloadtdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz
tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kviewshell')
-rw-r--r--kviewshell/empty_multipage.cpp6
-rw-r--r--kviewshell/empty_multipage.h2
-rw-r--r--kviewshell/kviewpart.cpp6
-rw-r--r--kviewshell/kviewpart.h6
-rw-r--r--kviewshell/main.cpp4
-rw-r--r--kviewshell/plugins/djvu/djvumultipage.cpp6
-rw-r--r--kviewshell/plugins/djvu/djvumultipage.h2
7 files changed, 16 insertions, 16 deletions
diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp
index 8fc1a0f8..83ba49d9 100644
--- a/kviewshell/empty_multipage.cpp
+++ b/kviewshell/empty_multipage.cpp
@@ -37,11 +37,11 @@ EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, T
setRenderer(&emptyRenderer);
}
-KAboutData* EmptyMultiPage::createAboutData()
+TDEAboutData* EmptyMultiPage::createAboutData()
{
- return new KAboutData("emptymultipage", I18N_NOOP("Empty Multipage"),
+ return new TDEAboutData("emptymultipage", I18N_NOOP("Empty Multipage"),
"1.0", I18N_NOOP(""),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("Copyright (c) 2005 Wilfried Huss"));
}
diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h
index a423c2ed..b27fb1b6 100644
--- a/kviewshell/empty_multipage.h
+++ b/kviewshell/empty_multipage.h
@@ -41,7 +41,7 @@ public:
/// opens a file
virtual bool openFile() { return false; }
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
private:
EmptyRenderer emptyRenderer;
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 6afcee50..e4dbf633 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -1404,11 +1404,11 @@ void KViewPart::setStatusBarTextFromMultiPage( const TQString &msg )
emit setStatusBarText(msg);
}
-KAboutData* KViewPart::createAboutData()
+TDEAboutData* KViewPart::createAboutData()
{
- return new KAboutData("kviewerpart", I18N_NOOP("Document Viewer Part"),
+ return new TDEAboutData("kviewerpart", I18N_NOOP("Document Viewer Part"),
"0.6", I18N_NOOP(""),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("Copyright (c) 2005 Wilfried Huss"));
}
diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h
index 9fd0ed92..80c427c5 100644
--- a/kviewshell/kviewpart.h
+++ b/kviewshell/kviewpart.h
@@ -9,13 +9,13 @@
#include <kparts/browserextension.h>
#include <tqtimer.h>
-class KAboutData;
+class TDEAboutData;
class KAboutDialog;
class KAccel;
class KAction;
class KConfig;
class KDirWatch;
-class KInstance;
+class TDEInstance;
class KMultiPage;
class KRadioAction;
class KSelectAction;
@@ -38,7 +38,7 @@ public:
const char *name, const TQStringList& args);
virtual ~KViewPart();
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
bool isValid() { return multiPage; }
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index 95b5e9d8..132cbfda 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -34,8 +34,8 @@ static const char description[] = I18N_NOOP("Generic framework for viewer applic
int main(int argc, char **argv)
{
- KAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6",
- description, KAboutData::License_GPL,
+ TDEAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6",
+ description, TDEAboutData::License_GPL,
"(C) 2000, Matthias Hoelzer-Kluepfel\n"
"(C) 2004-2005, Wilfried Huss",
I18N_NOOP("Displays various document formats. "
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index edc7e256..591447db 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -89,12 +89,12 @@ DjVuMultiPage::~DjVuMultiPage()
}
-KAboutData* DjVuMultiPage::createAboutData()
+TDEAboutData* DjVuMultiPage::createAboutData()
{
/* You obviously want to change this to match your setup */
- KAboutData* about = new KAboutData("djvumultipage", I18N_NOOP("KDjView"), "0.1",
+ TDEAboutData* about = new TDEAboutData("djvumultipage", I18N_NOOP("KDjView"), "0.1",
I18N_NOOP("KViewshell DjVu Plugin."),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"Wilfried Huss",
I18N_NOOP("This program displays DjVu files."));
diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h
index d7c59b70..163bf474 100644
--- a/kviewshell/plugins/djvu/djvumultipage.h
+++ b/kviewshell/plugins/djvu/djvumultipage.h
@@ -119,7 +119,7 @@ public:
This member returns a structure that contains information about the
authors of the implementation
*/
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
/** Re-implementation of the print method */
virtual void print();