alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove backward compatibility Qt 4 code in ifdefs.

Browse Source
This commit is contained in:
Stephen Kelly 2013-01-19 18:06:53 +01:00
parent 9212e9fecc
commit 71d4b1ab85
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
private/remoteservice.cpp
View File

@ -134,11 +134,7 @@ void RemoteService::setLocation(const QUrl &location)
QString RemoteService::location() const
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
return m_location.toString();
#else
return m_location.toDisplayString();
#endif
}
bool RemoteService::isReady() const

2
private/windowshadows.cpp
View File

@ -23,7 +23,7 @@
#include <config-plasma.h>
#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if HAVE_X11
#pragma message("X11 Pixmap code disabled, X11 <=> Qt pixmap conversion code not available in Qt 5.0")
#undef HAVE_X11
#define HAVE_X11 0

8
theme.cpp
View File

@ -30,10 +30,8 @@
#include "config-plasma.h"
#if HAVE_X11
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include "private/effectwatcher_p.h"
#endif
#endif
#include <kcolorscheme.h>
#include <kcomponentdata.h>
@ -114,7 +112,7 @@ public:
if (QPixmap::defaultDepth() > 8) {
QObject::connect(KWindowSystem::self(), SIGNAL(compositingChanged(bool)), q, SLOT(compositingChanged(bool)));
#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if HAVE_X11
//watch for blur effect property changes as well
if (!s_blurEffectWatcher) {
s_blurEffectWatcher = new EffectWatcher("_KDE_NET_WM_BLUR_BEHIND_REGION");
@ -171,7 +169,7 @@ public:
static const char *defaultTheme;
static const char *systemColorsTheme;
static const char *themeRcFile;
#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if HAVE_X11
static EffectWatcher *s_blurEffectWatcher;
#endif
@ -216,7 +214,7 @@ const char *ThemePrivate::themeRcFile = "plasmarc";
// the system colors theme is used to cache unthemed svgs with colorization needs
// these svgs do not follow the theme's colors, but rather the system colors
const char *ThemePrivate::systemColorsTheme = "internal-system-colors";
#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if HAVE_X11
EffectWatcher *ThemePrivate::s_blurEffectWatcher = 0;
#endif