modernize: Use ranged-for loops in some obvious cases

[quassel.git] / src / qtui / statusnotifieritemdbus.cpp

diff --git a/src/qtui/statusnotifieritemdbus.cpp b/src/qtui/statusnotifieritemdbus.cpp
index ee21928..cd4c4cf 100644 (file)
--- a/src/qtui/statusnotifieritemdbus.cpp
+++ b/src/qtui/statusnotifieritemdbus.cpp
@@ -24,17 +24,11 @@
 #include "statusnotifieritemdbus.h"
 #include "statusnotifieritem.h"
 
+#include <QApplication>
 #include <QDBusConnection>
-#include <QPixmap>
 #include <QImage>
-#include <QApplication>
 #include <QMenu>
-#include <QMovie>
-
-#ifdef HAVE_KDE4
-#  include <KWindowInfo>
-#  include <KWindowSystem>
-#endif
+#include <QPixmap>
 
 #include "statusnotifierwatcher.h"
 #include "statusnotifieritemadaptor.h"
@@ -45,7 +39,6 @@ __inline int toInt(WId wid)
     return (int)((__int64)wid);
 }
 
-
 #else
 __inline int toInt(WId wid)
 {
@@ -92,8 +85,8 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, DBusImageStruct &
 const QDBusArgument &operator<<(QDBusArgument &argument, const DBusImageVector &iconVector)
 {
     argument.beginArray(qMetaTypeId<DBusImageStruct>());
-    for (int i = 0; i < iconVector.size(); ++i) {
-        argument << iconVector[i];
+    for (const auto &i : iconVector) {
+        argument << i;
     }
     argument.endArray();
     return argument;
@@ -320,15 +313,7 @@ void StatusNotifierItemDBus::ContextMenu(int x, int y)
 
     //TODO: nicer placement, possible?
     if (!m_statusNotifierItem->trayMenu()->isVisible()) {
-#ifdef HAVE_KDE4
-        m_statusNotifierItem->trayMenu()->setWindowFlags(Qt::Window|Qt::FramelessWindowHint);
-#endif
         m_statusNotifierItem->trayMenu()->popup(QPoint(x, y));
-#ifdef HAVE_KDE4
-        KWindowSystem::setState(m_statusNotifierItem->trayMenu()->winId(), NET::SkipTaskbar|NET::SkipPager|NET::KeepAbove);
-        KWindowSystem::setType(m_statusNotifierItem->trayMenu()->winId(), NET::PopupMenu);
-        KWindowSystem::forceActiveWindow(m_statusNotifierItem->trayMenu()->winId());
-#endif
     }
     else {
         m_statusNotifierItem->trayMenu()->hide();