summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:51:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:51:20 -0600
commit9c8d64b5e7f2552116b0dc9c3070dc7529118432 (patch)
tree7869ba3a44dd108ce44ecea2526a3dbffded9511
parent9be8a1a36d76dd6f4c5114fa51d4a5d18f98948b (diff)
downloadgwenview-9c8d64b5e7f2552116b0dc9c3070dc7529118432.tar.gz
gwenview-9c8d64b5e7f2552116b0dc9c3070dc7529118432.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r--src/app/main.cpp4
-rw-r--r--src/app/mainwindow.cpp2
-rw-r--r--src/app/testvtabwidget.cpp2
-rw-r--r--src/gvdirpart/gvdirpart.cpp6
-rw-r--r--src/gvdirpart/gvdirpart.h4
-rw-r--r--src/gvimagepart/gvimagepart.cpp8
-rw-r--r--src/gvimagepart/gvimagepart.h4
-rw-r--r--src/imageutils/testjpegcontent.cpp2
8 files changed, 16 insertions, 16 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3767036..b6734ab 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -105,8 +105,8 @@ void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
extern "C"
KDE_EXPORT int kdemain (int argc, char *argv[]) {
- KAboutData aboutData("gwenview", I18N_NOOP("Gwenview"),
- version, I18N_NOOP("An image viewer for TDE"), KAboutData::License_GPL,
+ TDEAboutData aboutData("gwenview", I18N_NOOP("Gwenview"),
+ version, I18N_NOOP("An image viewer for TDE"), TDEAboutData::License_GPL,
"Copyright 2000-2006, The Gwenview developers",0,"http://gwenview.sourceforge.net");
aboutData.addAuthor("Aurélien Gâteau", I18N_NOOP("Main developer"), "aurelien.gateau@free.fr");
aboutData.addAuthor("Luboš Luňák", I18N_NOOP("Developer"), "l.lunak@suse.cz");
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 36e4a5e..f2ebcdc 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -453,7 +453,7 @@ void MainWindow::printFile() {
KPrinter printer;
printer.setDocName(mDocument->filename());
- const KAboutData* pAbout = TDEApplication::kApplication()->aboutData();
+ const TDEAboutData* pAbout = TDEApplication::kApplication()->aboutData();
TQString nm = pAbout->appName();
nm += "-";
nm += pAbout->version();
diff --git a/src/app/testvtabwidget.cpp b/src/app/testvtabwidget.cpp
index 1047527..a926b1c 100644
--- a/src/app/testvtabwidget.cpp
+++ b/src/app/testvtabwidget.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <vtabwidget.h>
int main(int argc, char* argv[]) {
- KAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
+ TDEAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app;
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index 3f321e5..25d0a8a 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -140,10 +140,10 @@ void GVDirPart::partActivateEvent(KParts::PartActivateEvent* event) {
}
-KAboutData* GVDirPart::createAboutData() {
- KAboutData* aboutData = new KAboutData( "gvdirpart", I18N_NOOP("GVDirPart"),
+TDEAboutData* GVDirPart::createAboutData() {
+ TDEAboutData* aboutData = new TDEAboutData( "gvdirpart", I18N_NOOP("GVDirPart"),
"0.1", I18N_NOOP("Image Browser"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"(c) 2004, Jonathan Riddell <jr@jriddell.org>");
return aboutData;
}
diff --git a/src/gvdirpart/gvdirpart.h b/src/gvdirpart/gvdirpart.h
index 7bff76b..40401ff 100644
--- a/src/gvdirpart/gvdirpart.h
+++ b/src/gvdirpart/gvdirpart.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
// Forward declarations
class TQPoint;
class TQSplitter;
-class KAboutData;
+class TDEAboutData;
class KAction;
class KToggleAction;
@@ -79,7 +79,7 @@ public:
/**
* Return information about the part
*/
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
/**
* Returns the name of the current file in the pixmap
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 69c1d64..64453b8 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -150,10 +150,10 @@ void GVImagePart::guiActivateEvent( KParts::GUIActivateEvent* event) {
}
-KAboutData* GVImagePart::createAboutData() {
- KAboutData* aboutData = new KAboutData( "gvimagepart", I18N_NOOP("GVImagePart"),
+TDEAboutData* GVImagePart::createAboutData() {
+ TDEAboutData* aboutData = new TDEAboutData( "gvimagepart", I18N_NOOP("GVImagePart"),
"0.1", I18N_NOOP("Image Viewer"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
"(c) 2004, Jonathan Riddell <jr@jriddell.org>");
return aboutData;
}
@@ -407,7 +407,7 @@ void DataUploader::slotJobFinished(KIO::Job* job) {
*/
class PopupGUIClient : public KXMLGUIClient {
public:
- PopupGUIClient( KInstance *inst, const TQString &doc ) {
+ PopupGUIClient( TDEInstance *inst, const TQString &doc ) {
setInstance( inst );
setXML( doc );
}
diff --git a/src/gvimagepart/gvimagepart.h b/src/gvimagepart/gvimagepart.h
index 4a2ca17..0bcc8d1 100644
--- a/src/gvimagepart/gvimagepart.h
+++ b/src/gvimagepart/gvimagepart.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
class TQFile;
class TQPoint;
-class KAboutData;
+class TDEAboutData;
class KAction;
class KDirLister;
class KFileItem;
@@ -72,7 +72,7 @@ public:
/**
* Return information about the part
*/
- static KAboutData* createAboutData();
+ static TDEAboutData* createAboutData();
/**
* Returns m_file
diff --git a/src/imageutils/testjpegcontent.cpp b/src/imageutils/testjpegcontent.cpp
index 1518127..98de63b 100644
--- a/src/imageutils/testjpegcontent.cpp
+++ b/src/imageutils/testjpegcontent.cpp
@@ -201,7 +201,7 @@ void testSetComment() {
int main(int argc, char* argv[]) {
TestEnvironment testEnv;
bool result;
- KAboutData aboutData("testjpegcontent", "testjpegcontent", "0");
+ TDEAboutData aboutData("testjpegcontent", "testjpegcontent", "0");
TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication kapplication;