From d1ae9dc4a723f56d31e5eddb2aa6634be4602ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 17 May 2014 03:20:43 +0100
Subject: [PATCH] Port away from KMenu.

---
 src/gui/mainwindow.cpp | 20 ++++++++++----------
 src/util/helpers.cpp   |  6 ++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index d7c1c0e..687a4bb 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -61,7 +61,6 @@
 #include <kstandardguiitem.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kmenu.h>
 #include <KLocalizedString>
 #include <kxmlguifactory.h>
 #include <kfiledialog.h>
@@ -75,6 +74,7 @@
 #include <QPointer>
 #include <QFile>
 #include <QDateTime>
+#include <QMenu>
 #include <QTextStream>
 
 #include <config.h>
@@ -482,7 +482,7 @@ void MainWindow::updateWindowTitle()
 
 void MainWindow::on_m_ListOperations_contextMenuRequested(const QPoint& pos)
 {
-	KMenu* menu = static_cast<KMenu*>(guiFactory()->container("edit", this));
+	QMenu* menu = static_cast<QMenu*>(guiFactory()->container("edit", this));
 
 	if (menu)
 		menu->exec(pos);
@@ -490,7 +490,7 @@ void MainWindow::on_m_ListOperations_contextMenuRequested(const QPoint& pos)
 
 void MainWindow::on_m_TreeLog_contextMenuRequested(const QPoint& pos)
 {
-	KMenu* menu = static_cast<KMenu*>(guiFactory()->container("log", this));
+	QMenu* menu = static_cast<QMenu*>(guiFactory()->container("log", this));
 
 	if (menu)
 		menu->exec(pos);
@@ -498,7 +498,7 @@ void MainWindow::on_m_TreeLog_contextMenuRequested(const QPoint& pos)
 
 void MainWindow::on_m_ListDevices_contextMenuRequested(const QPoint& pos)
 {
-	KMenu* menu = static_cast<KMenu*>(guiFactory()->container("device", this));
+	QMenu* menu = static_cast<QMenu*>(guiFactory()->container("device", this));
 
 	if (menu)
 		menu->exec(pos);
@@ -506,15 +506,15 @@ void MainWindow::on_m_ListDevices_contextMenuRequested(const QPoint& pos)
 
 void MainWindow::on_m_PartitionManagerWidget_contextMenuRequested(const QPoint& pos)
 {
-	KMenu* menu = NULL;
+	QMenu* menu = NULL;
 
 	if (pmWidget().selectedPartition() == NULL)
 	{
 		if (pmWidget().selectedDevice() != NULL)
-			menu = static_cast<KMenu*>(guiFactory()->container("device", this));
+			menu = static_cast<QMenu*>(guiFactory()->container("device", this));
 	}
 	else
-		menu = static_cast<KMenu*>(guiFactory()->container("partition", this));
+		menu = static_cast<QMenu*>(guiFactory()->container("partition", this));
 
 	if (menu)
 		menu->exec(pos);
@@ -595,7 +595,7 @@ void MainWindow::on_m_DeviceScanner_finished()
 
 void MainWindow::updateSeletedDeviceMenu()
 {
-	KMenu* devicesMenu = static_cast<KMenu*>(guiFactory()->container("selectedDevice", this));
+	QMenu* devicesMenu = static_cast<QMenu*>(guiFactory()->container("selectedDevice", this));
 	devicesMenu->clear();
 
 	devicesMenu->setEnabled(!operationStack().previewDevices().isEmpty());
@@ -614,7 +614,7 @@ void MainWindow::updateSeletedDeviceMenu()
 void MainWindow::onSelectedDeviceMenuTriggered(bool)
 {
 	QAction* action = qobject_cast<QAction*>(sender());
-	KMenu* devicesMenu = static_cast<KMenu*>(guiFactory()->container("selectedDevice", this));
+	QMenu* devicesMenu = static_cast<QMenu*>(guiFactory()->container("selectedDevice", this));
 
 	if (action == NULL || action->parent() != devicesMenu)
 		return;
@@ -627,7 +627,7 @@ void MainWindow::onSelectedDeviceMenuTriggered(bool)
 
 void MainWindow::on_m_ListDevices_selectionChanged(const QString& device_node)
 {
-	KMenu* devicesMenu = static_cast<KMenu*>(guiFactory()->container("selectedDevice", this));
+	QMenu* devicesMenu = static_cast<QMenu*>(guiFactory()->container("selectedDevice", this));
 
 	foreach (QAction* entry, qFindChildren<QAction*>(devicesMenu))
 		entry->setChecked(entry->data().toString() == device_node);
diff --git a/src/util/helpers.cpp b/src/util/helpers.cpp
index 7377950..66c445c 100644
--- a/src/util/helpers.cpp
+++ b/src/util/helpers.cpp
@@ -31,7 +31,6 @@
 #include <kcomponentdata.h>
 #include <kstandarddirs.h>
 #include <kcmdlineargs.h>
-#include <kmenu.h>
 #include <kstringhandler.h>
 
 #include <solid/device.h>
@@ -39,6 +38,7 @@
 #include <QProcess>
 #include <QFileInfo>
 #include <QApplication>
+#include <QMenu>
 #include <QPainter>
 #include <QIcon>
 #include <QPixmap>
@@ -159,9 +159,7 @@ QIcon createFileSystemColor(FileSystem::Type type, quint32 size)
 
 void showColumnsContextMenu(const QPoint& p, QTreeWidget& tree)
 {
-	KMenu headerMenu;
-
-	headerMenu.addTitle(i18nc("@title:menu", "Columns"));
+	QMenu headerMenu(i18nc("@title:menu", "Columns"));
 
 	QHeaderView* header = tree.header();