diff options
Diffstat (limited to 'src/plugins/Ui')
| -rw-r--r-- | src/plugins/Ui/skinned/pixmapwidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/pixmapwidget.h | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/playlist.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/windowsystem.cpp | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/Ui/skinned/pixmapwidget.cpp b/src/plugins/Ui/skinned/pixmapwidget.cpp index 7a8d8150b..d802a3ce1 100644 --- a/src/plugins/Ui/skinned/pixmapwidget.cpp +++ b/src/plugins/Ui/skinned/pixmapwidget.cpp @@ -31,7 +31,7 @@ PixmapWidget::PixmapWidget(QWidget *parent) PixmapWidget::~PixmapWidget() {} -void PixmapWidget::setPixmap(const QPixmap pixmap, bool fixed_size) +void PixmapWidget::setPixmap(const QPixmap &pixmap, bool fixed_size) { m_pixmap = pixmap; if(fixed_size) diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h index 52e7871eb..13b63150b 100644 --- a/src/plugins/Ui/skinned/pixmapwidget.h +++ b/src/plugins/Ui/skinned/pixmapwidget.h @@ -35,7 +35,7 @@ public: virtual ~PixmapWidget(); - virtual void setPixmap(const QPixmap, bool fixed_size = false); + virtual void setPixmap(const QPixmap &pixmap, bool fixed_size = false); protected: void paintEvent ( QPaintEvent * event ); diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index 4093602b1..7a33b95b0 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -631,7 +631,7 @@ void PlayList::generateCopySelectedMenu() foreach(QString name, m_pl_manager->playListNames()) { - action = m_copySelectedMenu->addAction("&"+name.replace("&", "&&")); + m_copySelectedMenu->addAction("&"+name.replace("&", "&&")); } } diff --git a/src/plugins/Ui/skinned/windowsystem.cpp b/src/plugins/Ui/skinned/windowsystem.cpp index 4fb1aec1e..a971214b3 100644 --- a/src/plugins/Ui/skinned/windowsystem.cpp +++ b/src/plugins/Ui/skinned/windowsystem.cpp @@ -86,9 +86,8 @@ QString WindowSystem::netWindowManagerName() } XFree(retValue2); - retValue2 = NULL; - retValue2 = getWindowProperty(win, "_NET_WM_NAME"); + XFree(retValue1); if (retValue2 == NULL) return QString(); @@ -156,7 +155,6 @@ unsigned char* WindowSystem::getWindowProperty(WId win, const char* prop) if (reqAtom == None) return NULL; - int retCheck = None; Atom retType = None; int retFormat = 0; unsigned long retItems = 0UL; @@ -164,7 +162,7 @@ unsigned char* WindowSystem::getWindowProperty(WId win, const char* prop) unsigned char* retValue = NULL; // Check if the property exists and calculate its length. - retCheck = XGetWindowProperty(dsp, win, + int retCheck = XGetWindowProperty(dsp, win, reqAtom, 0L, 0L, False, AnyPropertyType, &retType, &retFormat, &retItems, &retMoreBytes, &retValue); |
