kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 09:50:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

kdelibs4support--

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/kitemviews/kfileitemlistwidget.cpp
View file

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

2
src/kitemviews/private/kbaloorolesprovider.cpp
View file

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

2
src/panels/places/placesitemlistwidget.cpp
View file

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

2
src/settings/general/previewssettingspage.cpp
View file

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

3
src/settings/kcm/kcmdolphinnavigation.cpp
View file

@ -35,9 +35,6 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
{ {
Q_UNUSED(args); 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); setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this); QVBoxLayout* topLayout = new QVBoxLayout(this);

3
src/settings/kcm/kcmdolphinservices.cpp
View file

@ -35,9 +35,6 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
{ {
Q_UNUSED(args); 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); setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this); QVBoxLayout* topLayout = new QVBoxLayout(this);

3
src/settings/kcm/kcmdolphinviewmodes.cpp
View file

@ -41,9 +41,6 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
{ {
Q_UNUSED(args); 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); setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this); QVBoxLayout* topLayout = new QVBoxLayout(this);

3
src/statusbar/mountpointobservercache.cpp
View file

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

2
src/statusbar/statusbarspaceinfo.h
View file

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

3
src/views/dolphinnewfilemenuobserver.cpp
View file

@ -19,7 +19,6 @@
#include "dolphinnewfilemenuobserver.h" #include "dolphinnewfilemenuobserver.h"
#include <KGlobal>
#include "dolphinnewfilemenu.h" #include "dolphinnewfilemenu.h"
class DolphinNewFileMenuObserverSingleton class DolphinNewFileMenuObserverSingleton
@ -27,7 +26,7 @@ class DolphinNewFileMenuObserverSingleton
public: public:
DolphinNewFileMenuObserver instance; DolphinNewFileMenuObserver instance;
}; };
K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver) Q_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance() DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
{ {

3
src/views/renamedialog.cpp
View file

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