diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:51:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:51:20 -0600 |
| commit | 9c8d64b5e7f2552116b0dc9c3070dc7529118432 (patch) | |
| tree | 7869ba3a44dd108ce44ecea2526a3dbffded9511 /src/app | |
| parent | 9be8a1a36d76dd6f4c5114fa51d4a5d18f98948b (diff) | |
| download | gwenview-9c8d64b5e7f2552116b0dc9c3070dc7529118432.tar.gz gwenview-9c8d64b5e7f2552116b0dc9c3070dc7529118432.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 4 | ||||
| -rw-r--r-- | src/app/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/app/testvtabwidget.cpp | 2 |
3 files changed, 4 insertions, 4 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; |