kdelibs4support--

This commit is contained in:
Montel Laurent 2015-02-06 13:21:27 +01:00
parent 3dbee30c1a
commit f67bdd0fb7
11 changed files with 6 additions and 21 deletions

View file

@ -21,7 +21,6 @@
#include "kfileitemmodel.h"
#include "kitemlistview.h"
#include <kmimetype.h>
#include <KLocale>
#include <KIO/MetaData>
#include <QDateTime>

View file

@ -35,7 +35,7 @@ struct KBalooRolesProviderSingleton
{
KBalooRolesProvider instance;
};
K_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider)
Q_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider)
KBalooRolesProvider& KBalooRolesProvider::instance()

View file

@ -19,8 +19,6 @@
#include "placesitemlistwidget.h"
#include "kdebug.h"
PlacesItemListWidget::PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
KStandardItemListWidget(informant, parent)
{

View file

@ -25,7 +25,6 @@
#include <KConfigGroup>
#include <KGlobal>
#include <KLocalizedString>
#include <KNumInput>
#include <KServiceTypeTrader>
#include <KService>
@ -41,6 +40,7 @@
#include <QScrollBar>
#include <QShowEvent>
#include <QSlider>
#include <QSpinBox>
#include <QSortFilterProxyModel>
#include <QVBoxLayout>

View file

@ -35,9 +35,6 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
{
Q_UNUSED(args);
//KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
//KLocale::global()->insertCatalog("dolphin");
setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this);

View file

@ -35,9 +35,6 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
{
Q_UNUSED(args);
//KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
//KLocale::global()->insertCatalog("dolphin");
setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this);

View file

@ -41,9 +41,6 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
{
Q_UNUSED(args);
//KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
//KLocale::global()->insertCatalog("dolphin");
setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this);

View file

@ -21,7 +21,6 @@
#include "mountpointobserver.h"
#include <KGlobal>
#include <KMountPoint>
#include <QTimer>
@ -31,7 +30,7 @@ class MountPointObserverCacheSingleton
public:
MountPointObserverCache instance;
};
K_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
MountPointObserverCache::MountPointObserverCache() :

View file

@ -23,7 +23,7 @@
#include <QUrl>
#include <kcapacitybar.h>
#include <KCapacityBar>
class QHideEvent;
class QShowEvent;

View file

@ -19,7 +19,6 @@
#include "dolphinnewfilemenuobserver.h"
#include <KGlobal>
#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()
{

View file

@ -24,8 +24,6 @@
#include <KIO/CopyJob>
#include <KIO/FileUndoManager>
#include <kstringhandler_deprecated.h> //TODO port to QCollator
#include <knuminput.h>
#include <kmimetype.h>
#include <KJobUiDelegate>
#include <QHBoxLayout>
@ -35,6 +33,7 @@
#include <QDialogButtonBox>
#include <QPushButton>
#include <QLineEdit>
#include <QSpinBox>
#include <KGuiItem>
RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :