summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2014-10-19 13:20:30 (GMT)
committerMontel Laurent <montel@kde.org>2014-10-19 13:24:33 (GMT)
commit8e7429ddcc9767a3b215a99e4ac7f338ef77c7d3 (patch)
tree02c3aa4d85095ac7bbd4474a1026e1028634ec05
parent2910f82a04ab994379ab60c5860e526f93da8456 (diff)
kdelibs4support--
-rw-r--r--ui/bookmarklist.cpp2
-rw-r--r--ui/findbar.cpp2
-rw-r--r--ui/formwidgets.cpp2
-rw-r--r--ui/guiutils.cpp6
-rw-r--r--ui/ktreeviewsearchline.cpp1
-rw-r--r--ui/minibar.cpp2
-rw-r--r--ui/pageviewannotator.cpp4
-rw-r--r--ui/pageviewutils.cpp2
-rw-r--r--ui/presentationsearchbar.cpp2
-rw-r--r--ui/presentationwidget.cpp1
-rw-r--r--ui/side_reviews.cpp4
-rw-r--r--ui/sidebar.cpp2
-rw-r--r--ui/thumbnaillist.cpp4
-rw-r--r--ui/videowidget.cpp2
14 files changed, 16 insertions, 20 deletions
diff --git a/ui/bookmarklist.cpp b/ui/bookmarklist.cpp
index f48a9f4..0950bd5 100644
--- a/ui/bookmarklist.cpp
+++ b/ui/bookmarklist.cpp
@@ -19,7 +19,7 @@
#include <QtCore/QDebug>
#include <QIcon>
-#include <klocale.h>
+#include <KLocalizedString>
#include <qmenu.h>
#include <ktreewidgetsearchline.h>
diff --git a/ui/findbar.cpp b/ui/findbar.cpp
index cebc761..7363532 100644
--- a/ui/findbar.cpp
+++ b/ui/findbar.cpp
@@ -16,7 +16,7 @@
#include <qtoolbutton.h>
#include <qevent.h>
#include <QIcon>
-#include <klocale.h>
+#include <KLocalizedString>
#include <qpushbutton.h>
// local includes
diff --git a/ui/formwidgets.cpp b/ui/formwidgets.cpp
index 08f7149..20b23e9 100644
--- a/ui/formwidgets.cpp
+++ b/ui/formwidgets.cpp
@@ -15,7 +15,7 @@
#include <QMenu>
#include <QEvent>
#include <klineedit.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kstandardaction.h>
#include <kaction.h>
#include <kurl.h>
diff --git a/ui/guiutils.cpp b/ui/guiutils.cpp
index 2e5f812..0907927 100644
--- a/ui/guiutils.cpp
+++ b/ui/guiutils.cpp
@@ -14,11 +14,9 @@
#include <qsvgrenderer.h>
#include <qtextdocument.h>
#include <kfiledialog.h>
-#include <kglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
#include <kmessagebox.h>
-
+#include <KLocalizedString>
// local includes
#include "core/action.h"
@@ -57,7 +55,7 @@ QSvgRenderer* GuiUtilsHelper::svgStamps()
return svgStampFile.get();
}
-K_GLOBAL_STATIC( GuiUtilsHelper, s_data )
+Q_GLOBAL_STATIC( GuiUtilsHelper, s_data )
namespace GuiUtils {
diff --git a/ui/ktreeviewsearchline.cpp b/ui/ktreeviewsearchline.cpp
index 868868c..f84e523 100644
--- a/ui/ktreeviewsearchline.cpp
+++ b/ui/ktreeviewsearchline.cpp
@@ -198,7 +198,6 @@ void KTreeViewSearchLine::Private::checkItemParentsNotVisible( QTreeView *treeVi
#endif
}
-#include <kvbox.h>
/** Check whether \p item, its siblings and their descendents should be shown. Show or hide the items as necessary.
*
diff --git a/ui/minibar.cpp b/ui/minibar.cpp
index d10b653..0286434 100644
--- a/ui/minibar.cpp
+++ b/ui/minibar.cpp
@@ -24,7 +24,7 @@
#include <QIcon>
#include <kicontheme.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kacceleratormanager.h>
#include <qtoolbar.h>
diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index b5047ee..ead7bfb 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -21,11 +21,11 @@
#include <qvariant.h>
#include <QInputDialog>
#include <kiconloader.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kuser.h>
#include <QtCore/QDebug>
-#include <kmenu.h>
+#include <qmenu.h>
// system includes
#include <math.h>
diff --git a/ui/pageviewutils.cpp b/ui/pageviewutils.cpp
index 56566db..fe756cc 100644
--- a/ui/pageviewutils.cpp
+++ b/ui/pageviewutils.cpp
@@ -25,7 +25,7 @@
#include <kactioncollection.h>
#include <kcolorscheme.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <KLocalizedString>
// system includes
#include <math.h>
diff --git a/ui/presentationsearchbar.cpp b/ui/presentationsearchbar.cpp
index d021284..6885269 100644
--- a/ui/presentationsearchbar.cpp
+++ b/ui/presentationsearchbar.cpp
@@ -18,7 +18,7 @@
#include <qpushbutton.h>
#include <QIcon>
-#include <klocale.h>
+#include <KLocalizedString>
#include "searchlineedit.h"
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index efd05d1..beac241 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -39,7 +39,6 @@
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kselectaction.h>
-#include <kshortcut.h>
#include <kurl.h>
#include <kdialog.h>
diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp
index 69bcc10..a3e3e2b 100644
--- a/ui/side_reviews.cpp
+++ b/ui/side_reviews.cpp
@@ -20,8 +20,8 @@
#include <QtWidgets/QToolBar>
#include <QtWidgets/QTreeView>
-#include <kaction.h>
-#include <klocale.h>
+#include <qaction.h>
+#include <KLocalizedString>
#include <kiconloader.h>
#include <QIcon>
diff --git a/ui/sidebar.cpp b/ui/sidebar.cpp
index 4936f83..004cdce 100644
--- a/ui/sidebar.cpp
+++ b/ui/sidebar.cpp
@@ -28,7 +28,7 @@
#include <kglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <qmenu.h>
#include <kcolorscheme.h>
#include <kurlmimedata.h>
diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp
index 54cd367..0dd2f2e 100644
--- a/ui/thumbnaillist.cpp
+++ b/ui/thumbnaillist.cpp
@@ -17,9 +17,9 @@
#include <qpainter.h>
#include <qscrollbar.h>
#include <qsizepolicy.h>
-#include <klocale.h>
+#include <KLocalizedString>
#include <kurl.h>
-#include <kaction.h>
+#include <qaction.h>
#include <kdialog.h>
#include <kiconloader.h>
#include <kactioncollection.h>
diff --git a/ui/videowidget.cpp b/ui/videowidget.cpp
index f236100..dea9fb1 100644
--- a/ui/videowidget.cpp
+++ b/ui/videowidget.cpp
@@ -23,7 +23,7 @@
#include <qwidgetaction.h>
#include <QIcon>
-#include <klocale.h>
+#include <KLocalizedString>
#include <phonon/mediaobject.h>
#include <phonon/seekslider.h>