From f67bdd0fb70520b83f6428619c02a996724543b5 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 6 Feb 2015 13:21:27 +0100 Subject: kdelibs4support-- --- src/views/dolphinnewfilemenuobserver.cpp | 3 +-- src/views/renamedialog.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/views') diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp index 855f2675a..275e1c4fb 100644 --- a/src/views/dolphinnewfilemenuobserver.cpp +++ b/src/views/dolphinnewfilemenuobserver.cpp @@ -19,7 +19,6 @@ #include "dolphinnewfilemenuobserver.h" -#include #include "dolphinnewfilemenu.h" class DolphinNewFileMenuObserverSingleton @@ -27,7 +26,7 @@ class DolphinNewFileMenuObserverSingleton public: DolphinNewFileMenuObserver instance; }; -K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver) +Q_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver) DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance() { diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index f558f3c5f..6d009ba9a 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -24,8 +24,6 @@ #include #include #include //TODO port to QCollator -#include -#include #include #include @@ -35,6 +33,7 @@ #include #include #include +#include #include RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : -- cgit v1.3