diff --git a/kcontrol/input/kapplymousetheme.cpp b/kcontrol/input/kapplymousetheme.cpp index f293c63b..bb7188dd 100644 --- a/kcontrol/input/kapplymousetheme.cpp +++ b/kcontrol/input/kapplymousetheme.cpp @@ -24,6 +24,8 @@ #include +#include + #include #include @@ -60,7 +62,7 @@ int main( int argc, char* argv[] ) && isEmpty( XGetDefault( dpy, "Xcursor", "theme" )) && isEmpty( XcursorGetTheme( dpy))) { - theme = "Oxygen_White"; + theme = KDE_DEFAULT_CURSOR_THEME; } // Apply the KDE cursor theme to ourselves diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 7fdcec1a..7032bea7 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -59,7 +59,7 @@ extern "C" && QByteArray( XGetDefault( QX11Info::display(), "Xcursor", "theme" )).isEmpty() && QByteArray( XcursorGetTheme( QX11Info::display())).isEmpty()) { - theme = "Oxygen_White"; + theme = QString::fromLatin1(KDE_DEFAULT_CURSOR_THEME); } // Apply the KDE cursor theme to ourselves diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 52c93440..adc6cf6d 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -382,7 +382,7 @@ void ThemePage::load() void ThemePage::defaults() { view->selectionModel()->clear(); - QModelIndex defaultIndex = proxy->findIndex("Oxygen_White"); + QModelIndex defaultIndex = proxy->findIndex(KDE_DEFAULT_CURSOR_THEME); view->setCurrentIndex(defaultIndex); preferredSize = 0; updateSizeComboBox(); diff --git a/kcontrol/krdb/main.cpp b/kcontrol/krdb/main.cpp index 933177d7..9cf37d22 100644 --- a/kcontrol/krdb/main.cpp +++ b/kcontrol/krdb/main.cpp @@ -358,7 +358,7 @@ int main(int argc, char *argv[]) // Export the Xcursor theme & size settings KConfigGroup mousecfg(KSharedConfig::openConfig("kcminputrc"), "Mouse"); - QString theme = mousecfg.readEntry("cursorTheme", QString("Oxygen_White")); + QString theme = mousecfg.readEntry("cursorTheme", QString::fromLatin1(KDE_DEFAULT_CURSOR_THEME)); QString size = mousecfg.readEntry("cursorSize", QString()); QString contents; diff --git a/kgreeter/kgreeter.h b/kgreeter/kgreeter.h index df0f726c..5a6b1238 100644 --- a/kgreeter/kgreeter.h +++ b/kgreeter/kgreeter.h @@ -36,7 +36,7 @@ static QString KGreeterDefaultStyle() static QString KGreeterDefaultCursorTheme() { - return QString::fromLatin1("Oxygen_White"); + return QString::fromLatin1(KDE_DEFAULT_CURSOR_THEME); } static QString KGreeterDefaultBackground() diff --git a/kwin/effects/zoom/zoom.cpp b/kwin/effects/zoom/zoom.cpp index 4ff443df..0baaca74 100644 --- a/kwin/effects/zoom/zoom.cpp +++ b/kwin/effects/zoom/zoom.cpp @@ -31,6 +31,7 @@ along with this program. If not, see . #include #include #include +#include #include #include #include @@ -152,7 +153,7 @@ void ZoomEffect::recreateTexture() { // read details about the mouse-cursor theme define per default KConfigGroup mousecfg(KSharedConfig::openConfig("kcminputrc"), "Mouse"); - QString theme = mousecfg.readEntry("cursorTheme", QString()); + QString theme = mousecfg.readEntry("cursorTheme", QString::fromLatin1(KDE_DEFAULT_CURSOR_THEME)); QString size = mousecfg.readEntry("cursorSize", QString()); // fetch a reasonable size for the cursor-theme image