summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:53:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:53:44 -0600
commit4d3c1787513cb6c17f4e087bcf5e25b801731d94 (patch)
treee82c7e7e03f7c760013daa37a4bc3c5129a39b84 /src/app
parent4ff6dfc573c9413a887afd35ec2d6825e60067bc (diff)
downloadgwenview-4d3c1787513cb6c17f4e087bcf5e25b801731d94.tar.gz
gwenview-4d3c1787513cb6c17f4e087bcf5e25b801731d94.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main.cpp2
-rw-r--r--src/app/mainwindow.cpp2
-rw-r--r--src/app/testvtabwidget.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 0200a0d..3767036 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -129,7 +129,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication kapplication;
+ TDEApplication kapplication;
if (kapplication.isRestored()) {
RESTORE(MainWindow)
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index be3782d..36e4a5e 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 = KApplication::kApplication()->aboutData();
+ const KAboutData* 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 a607b55..1047527 100644
--- a/src/app/testvtabwidget.cpp
+++ b/src/app/testvtabwidget.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int main(int argc, char* argv[]) {
KAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
TDECmdLineArgs::init( argc, argv, &aboutData );
- KApplication app;
+ TDEApplication app;
Gwenview::VTabWidget tabWidget(0);
TQLabel* lbl=new TQLabel("label 1", &tabWidget);