summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-03-06 13:00:25 (GMT)
committerMontel Laurent <montel@kde.org>2015-03-06 13:00:25 (GMT)
commitc50c3d5332bdeab9ce4d53dddefdfd5963e6ad9a (patch)
tree65c92d6499acf0e398723ac75811c0c0e4e2cb57
parent8fad6ebe09048cbcfe2bec3d365d026ab1a1ddf8 (diff)
kdelibs4support--
-rw-r--r--autotests/mainshelltest.cpp2
-rw-r--r--autotests/parttest.cpp1
-rw-r--r--autotests/testingutils.cpp2
-rw-r--r--core/fileprinter.cpp6
4 files changed, 4 insertions, 7 deletions
diff --git a/autotests/mainshelltest.cpp b/autotests/mainshelltest.cpp
index f0569e0..475bf23 100644
--- a/autotests/mainshelltest.cpp
+++ b/autotests/mainshelltest.cpp
@@ -12,7 +12,7 @@
#include <qprintdialog.h>
#include <qwidget.h>
#include <kglobal.h>
-#include <ktabwidget.h>
+#include <qtabwidget.h>
#include "../shell/okular_main.h"
#include "../shell/shell.h"
diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp
index dd64a1c..1dd23d4 100644
--- a/autotests/parttest.cpp
+++ b/autotests/parttest.cpp
@@ -15,7 +15,6 @@
#include <KConfigDialog>
#include <KGlobal>
#include <KStandardDirs>
-#include <KTempDir>
#include <KAboutData>
#include <QTreeView>
diff --git a/autotests/testingutils.cpp b/autotests/testingutils.cpp
index 336edf2..49ab04b 100644
--- a/autotests/testingutils.cpp
+++ b/autotests/testingutils.cpp
@@ -9,7 +9,7 @@
#include "testingutils.h"
#include "core/annotations.h"
-#include <qtest_kde.h>
+#include <qtest.h>
namespace TestingUtils
{
diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index e17f37e..930c5eb 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -24,8 +24,6 @@
#include <KProcess>
#include <KShell>
-#include <kstandarddirs.h>
-#include <ktempdir.h>
#include <QtCore/QDebug>
#include <kdeversion.h>
#include <QStandardPaths>
@@ -121,9 +119,9 @@ int FilePrinter::doPrintFiles( QPrinter &printer, QStringList fileList, FileDele
//Some distros name the CUPS version of lpr as lpr-cups or lpr.cups so try those first
//before default to lpr, or failing that to lp
- if ( !KStandardDirs::findExe("lpr-cups").isEmpty() ) {
+ if ( !QStandardPaths::findExecutable("lpr-cups").isEmpty() ) {
exe = "lpr-cups";
- } else if ( !KStandardDirs::findExe("lpr.cups").isEmpty() ) {
+ } else if ( !QStandardPaths::findExecutable("lpr.cups").isEmpty() ) {
exe = "lpr.cups";
} else if ( !QStandardPaths::findExecutable("lpr").isEmpty() ) {
exe = "lpr";