diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index be176eabe2..e50b4c7163 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -29,8 +29,8 @@ along with this program. If not, see .
#include
#include
#include
-#include
+#include
#include
@@ -148,7 +148,7 @@ void CompositingPrefs::detect()
// environment variable.
// Direct rendering is preferred, since not all OpenGL extensions are
// available with indirect rendering.
- const QString opengl_test = KStandardDirs::findExe(QStringLiteral("kwin_opengl_test"));
+ const QString opengl_test = QStandardPaths::findExecutable(QStringLiteral("kwin_opengl_test"));
if (QProcess::execute(opengl_test) != 0) {
mEnableDirectRendering = false;
setenv("LIBGL_ALWAYS_INDIRECT", "1", true);
diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index c78b8caa3b..dff9fa41cc 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -24,11 +24,11 @@ along with this program. If not, see .
#include
#include
#include
-#include
#include
#include
#include
#include
+#include
int main( int argc, char* argv[] )
{
@@ -38,7 +38,7 @@ int main( int argc, char* argv[] )
KCmdLineArgs::init( argc, argv, &about );
KComponentData inst( &about );
Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
- QString file = KStandardDirs::locate( "data", QString( "kwin/default_rules/%1" ).arg(argv[ 1 ] ));
+ QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QString( "kwin/default_rules/%1" ).arg(argv[ 1 ] ));
if( file.isEmpty())
{
kWarning(1212) << "File " << argv[ 1 ] << " not found!" ;
diff --git a/main.cpp b/main.cpp
index 0b6ff7ff23..28029dcae6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -42,7 +42,7 @@ along with this program. If not, see .
#include
#include
-#include
+#include
#include
#include
#include
@@ -179,7 +179,7 @@ public:
void addWM(const QString& wm) {
// TODO: Check if WM is installed
- if (!KStandardDirs::findExe(wm).isEmpty())
+ if (!QStandardPaths::findExecutable(wm).isEmpty())
wmList->addItem(wm);
}
QString selectedWM() const {