summaryrefslogtreecommitdiffstats
path: root/kpdf
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:19:40 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:19:40 -0600
commit74f47aebb77b4744bf18960b81c3744106cf56e0 (patch)
tree98f808be7ee64f341ba893cfc4fc6a2db7ed5092 /kpdf
parentc705f8f0619865875d6247d9470dced55241bc79 (diff)
downloadtdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.tar.gz
tdegraphics-74f47aebb77b4744bf18960b81c3744106cf56e0.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kpdf')
-rw-r--r--kpdf/shell/main.cpp2
-rw-r--r--kpdf/ui/pageview.cpp2
-rw-r--r--kpdf/ui/presentationwidget.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp
index 6c3a351c..5009ba12 100644
--- a/kpdf/shell/main.cpp
+++ b/kpdf/shell/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
// see if we are starting with session management
if (app.isRestored())
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 0029676e..9642f7a9 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -1192,7 +1192,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
if (!client->isApplicationRegistered("kttsd"))
{
TQString error;
- if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+ if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
{
d->messageWindow->display( i18n("Starting KTTSD Failed: %1").arg(error) );
KpdfSettings::setUseKTTSD(false);
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 74800e88..865d8e50 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -890,7 +890,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
}
case KpdfSettings::EnumSlidesTransition::Random:
{
- return defaultTransition( KApplication::random() % 18 );
+ return defaultTransition( TDEApplication::random() % 18 );
break;
}
case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn: