diff options
39 files changed, 38 insertions, 78 deletions
diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h index 9f07c9d8d..72688893e 100644 --- a/src/kitemviews/kfileitemlistview.h +++ b/src/kitemviews/kfileitemlistview.h @@ -20,7 +20,7 @@ #ifndef KFILEITEMLISTVIEW_H #define KFILEITEMLISTVIEW_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kstandarditemlistview.h> diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h index b7061d38c..32959e4f6 100644 --- a/src/kitemviews/kfileitemlistwidget.h +++ b/src/kitemviews/kfileitemlistwidget.h @@ -20,7 +20,7 @@ #ifndef KFILEITEMLISTWIDGET_H #define KFILEITEMLISTWIDGET_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kstandarditemlistwidget.h> diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 535e0f3e4..d98d4538d 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -20,7 +20,7 @@ #ifndef KFILEITEMMODEL_H #define KFILEITEMMODEL_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <KFileItemList> #include <QUrl> #include <kitemviews/kitemmodelbase.h> diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index e8b186a96..6c82dbe4a 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -25,7 +25,7 @@ #include <KFileItem> #include <kitemviews/kitemmodelbase.h> -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QObject> #include <QSet> diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 55a9a118f..6f2851b3e 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -23,7 +23,7 @@ #ifndef KITEMLISTCONTAINER_H #define KITEMLISTCONTAINER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QAbstractScrollArea> diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index 99df53104..ed5b71615 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -23,7 +23,7 @@ #ifndef KITEMLISTCONTROLLER_H #define KITEMLISTCONTROLLER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include "kitemset.h" diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h index 66fe929dd..c89da5027 100644 --- a/src/kitemviews/kitemlistgroupheader.h +++ b/src/kitemviews/kitemlistgroupheader.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTGROUPHEADER_H #define KITEMLISTGROUPHEADER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemliststyleoption.h> diff --git a/src/kitemviews/kitemlistheader.h b/src/kitemviews/kitemlistheader.h index fe2d0ac10..b361b912b 100644 --- a/src/kitemviews/kitemlistheader.h +++ b/src/kitemviews/kitemlistheader.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTHEADER_H #define KITEMLISTHEADER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QHash> #include <QObject> diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h index c4decd39e..a8318388c 100644 --- a/src/kitemviews/kitemlistselectionmanager.h +++ b/src/kitemviews/kitemlistselectionmanager.h @@ -23,7 +23,7 @@ #ifndef KITEMLISTSELECTIONMANAGER_H #define KITEMLISTSELECTIONMANAGER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemmodelbase.h> #include <kitemviews/kitemset.h> diff --git a/src/kitemviews/kitemliststyleoption.h b/src/kitemviews/kitemliststyleoption.h index 782dd0ec2..9290dc341 100644 --- a/src/kitemviews/kitemliststyleoption.h +++ b/src/kitemviews/kitemliststyleoption.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTSTYLEOPTION_H #define KITEMLISTSTYLEOPTION_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QFont> #include <QFontMetrics> diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index cc0754f2a..8130e45ed 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -23,7 +23,7 @@ #ifndef KITEMLISTVIEW_H #define KITEMLISTVIEW_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kstandarditemlistgroupheader.h> #include <kitemviews/kitemliststyleoption.h> diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index 674f1d1af..87cf4b9fa 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -22,7 +22,7 @@ #ifndef QT_NO_ACCESSIBILITY -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QtCore/qpointer.h> #include <QtGui/qaccessible.h> diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h index 07fc789f0..723847c43 100644 --- a/src/kitemviews/kitemlistwidget.h +++ b/src/kitemviews/kitemlistwidget.h @@ -23,7 +23,7 @@ #ifndef KITEMLISTWIDGET_H #define KITEMLISTWIDGET_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemliststyleoption.h> diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h index 283cfa552..e46d761fc 100644 --- a/src/kitemviews/kitemmodelbase.h +++ b/src/kitemviews/kitemmodelbase.h @@ -23,7 +23,7 @@ #ifndef KITEMMODELBASE_H #define KITEMMODELBASE_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemrange.h> #include <kitemviews/kitemset.h> diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h index 59190bfd5..b1d5edf2e 100644 --- a/src/kitemviews/kstandarditem.h +++ b/src/kitemviews/kstandarditem.h @@ -20,7 +20,7 @@ #ifndef KSTANDARDITEM_H #define KSTANDARDITEM_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QByteArray> #include <QHash> diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h index 871c93d8d..caf906ddf 100644 --- a/src/kitemviews/kstandarditemlistgroupheader.h +++ b/src/kitemviews/kstandarditemlistgroupheader.h @@ -20,7 +20,7 @@ #ifndef KSTANDARDITEMLISTGROUPHEADER_H #define KSTANDARDITEMLISTGROUPHEADER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemlistgroupheader.h> diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h index eb07c7f08..9fc43a940 100644 --- a/src/kitemviews/kstandarditemlistview.h +++ b/src/kitemviews/kstandarditemlistview.h @@ -20,7 +20,7 @@ #ifndef KSTANDARDITEMLISTVIEW_H #define KSTANDARDITEMLISTVIEW_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemlistview.h> diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index 7683f8433..8e61d06b4 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -20,7 +20,7 @@ #ifndef KSTANDARDITEMLISTWIDGET_H #define KSTANDARDITEMLISTWIDGET_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemlistwidget.h> diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h index 9d1db1a2b..3b5f5bd39 100644 --- a/src/kitemviews/kstandarditemmodel.h +++ b/src/kitemviews/kstandarditemmodel.h @@ -20,7 +20,7 @@ #ifndef KSTANDARDITEMMODEL_H #define KSTANDARDITEMMODEL_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemmodelbase.h> #include <QHash> #include <QList> diff --git a/src/kitemviews/private/kbaloorolesprovider.h b/src/kitemviews/private/kbaloorolesprovider.h index f1ad5c740..08d564d65 100644 --- a/src/kitemviews/private/kbaloorolesprovider.h +++ b/src/kitemviews/private/kbaloorolesprovider.h @@ -21,7 +21,7 @@ #ifndef KBALOO_ROLESPROVIDER_H #define KBALOO_ROLESPROVIDER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QHash> #include <QSet> diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h index 94a0e39fd..a9c8c845a 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.h +++ b/src/kitemviews/private/kfileitemmodeldirlister.h @@ -20,7 +20,7 @@ #ifndef KFILEITEMMODELDIRLISTER_H #define KFILEITEMMODELDIRLISTER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <KDirLister> #include <QUrl> diff --git a/src/kitemviews/private/kfileitemmodelfilter.h b/src/kitemviews/private/kfileitemmodelfilter.h index e4fb0a2ee..b26e31a00 100644 --- a/src/kitemviews/private/kfileitemmodelfilter.h +++ b/src/kitemviews/private/kfileitemmodelfilter.h @@ -21,7 +21,7 @@ #ifndef KFILEITEMMODELFILTER_H #define KFILEITEMMODELFILTER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QStringList> class KFileItem; diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h index b99f45f35..74c9ac518 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.h +++ b/src/kitemviews/private/kitemlistheaderwidget.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTHEADERWIDGET_H #define KITEMLISTHEADERWIDGET_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QGraphicsWidget> #include <QHash> #include <QList> diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h index 661178db8..1f315dabd 100644 --- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h +++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h @@ -23,7 +23,7 @@ #ifndef KITEMLISTKEYBOARDSEARCHMANAGER_H #define KITEMLISTKEYBOARDSEARCHMANAGER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QObject> #include <QString> diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h index aea58af46..39c7573ae 100644 --- a/src/kitemviews/private/kitemlistrubberband.h +++ b/src/kitemviews/private/kitemlistrubberband.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTRUBBERBAND_H #define KITEMLISTRUBBERBAND_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QObject> #include <QPointF> diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h index 8a1a857f6..bd64879af 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.h +++ b/src/kitemviews/private/kitemlistselectiontoggle.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTSELECTIONTOGGLE_H #define KITEMLISTSELECTIONTOGGLE_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QGraphicsWidget> #include <QPixmap> diff --git a/src/kitemviews/private/kitemlistsizehintresolver.h b/src/kitemviews/private/kitemlistsizehintresolver.h index a0ad033f3..3bd2319dd 100644 --- a/src/kitemviews/private/kitemlistsizehintresolver.h +++ b/src/kitemviews/private/kitemlistsizehintresolver.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTSIZEHINTRESOLVER_H #define KITEMLISTSIZEHINTRESOLVER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kitemmodelbase.h> #include <QSizeF> diff --git a/src/kitemviews/private/kitemlistsmoothscroller.h b/src/kitemviews/private/kitemlistsmoothscroller.h index ea5682208..963cf7b24 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.h +++ b/src/kitemviews/private/kitemlistsmoothscroller.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTSMOOTHSCROLLER_H #define KITEMLISTSMOOTHSCROLLER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QAbstractAnimation> #include <QObject> diff --git a/src/kitemviews/private/kitemlistviewanimation.h b/src/kitemviews/private/kitemlistviewanimation.h index e2e533850..ee4a08bce 100644 --- a/src/kitemviews/private/kitemlistviewanimation.h +++ b/src/kitemviews/private/kitemlistviewanimation.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTVIEWANIMATION_H #define KITEMLISTVIEWANIMATION_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QHash> #include <QObject> diff --git a/src/kitemviews/private/kitemlistviewlayouter.h b/src/kitemviews/private/kitemlistviewlayouter.h index 0efcab12b..fc82d6061 100644 --- a/src/kitemviews/private/kitemlistviewlayouter.h +++ b/src/kitemviews/private/kitemlistviewlayouter.h @@ -20,7 +20,7 @@ #ifndef KITEMLISTVIEWLAYOUTER_H #define KITEMLISTVIEWLAYOUTER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <QObject> #include <QRectF> diff --git a/src/kitemviews/private/kpixmapmodifier.h b/src/kitemviews/private/kpixmapmodifier.h index 4f863c349..b5eec6542 100644 --- a/src/kitemviews/private/kpixmapmodifier.h +++ b/src/kitemviews/private/kpixmapmodifier.h @@ -20,7 +20,7 @@ #ifndef KPIXMAPMODIFIER_H #define KPIXMAPMODIFIER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" class QPixmap; class QSize; diff --git a/src/libdolphin_export.h b/src/libdolphin_export.h deleted file mode 100644 index ff0f125c4..000000000 --- a/src/libdolphin_export.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - This file is part of the KDE project - Copyright (C) 2007 Montel Laurent <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef LIBDOLPHIN_EXPORT_H -#define LIBDOLPHIN_EXPORT_H - -/* needed for KDE_EXPORT macros */ -#include <kdemacros.h> - -/* needed, because e.g. Q_OS_UNIX is so frequently used */ - -#ifndef LIBDOLPHINPRIVATE_EXPORT -# if defined(MAKE_DOLPHINPRIVATE_LIB) - /* We are building this library */ -# define LIBDOLPHINPRIVATE_EXPORT KDE_EXPORT -# else - /* We are using this library */ -# define LIBDOLPHINPRIVATE_EXPORT KDE_IMPORT -# endif -#endif - -#endif diff --git a/src/main.cpp b/src/main.cpp index 91d32a08a..bcd19d4d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,12 +26,10 @@ #include <KCmdLineArgs> #include <KLocalizedString> #include <kmainwindow.h> -#include <kdemacros.h> #include <kdeversion.h> #include <KDebug> -extern "C" -KDE_EXPORT int kdemain(int argc, char **argv) +extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) { K4AboutData about("dolphin", 0, ki18nc("@title", "Dolphin"), diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h index 5f7c181e9..5f9cc3a5a 100644 --- a/src/views/dolphinfileitemlistwidget.h +++ b/src/views/dolphinfileitemlistwidget.h @@ -20,7 +20,7 @@ #ifndef DOLPHINFILEITEMLISTWIDGET_H #define DOLPHINFILEITEMLISTWIDGET_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <kitemviews/kfileitemlistwidget.h> #include <kversioncontrolplugin2.h> diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h index 7fd72e5c0..2b16825f4 100644 --- a/src/views/dolphinitemlistview.h +++ b/src/views/dolphinitemlistview.h @@ -23,7 +23,7 @@ #include <kitemviews/kfileitemlistview.h> #include <settings/viewmodes/viewmodesettings.h> -#include <libdolphin_export.h> +#include "libdolphin_export.h" class KFileItemListView; diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h index 9b744d5b3..92a9d59c9 100644 --- a/src/views/versioncontrol/updateitemstatesthread.h +++ b/src/views/versioncontrol/updateitemstatesthread.h @@ -20,7 +20,7 @@ #ifndef UPDATEITEMSTATESTHREAD_H #define UPDATEITEMSTATESTHREAD_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <views/versioncontrol/versioncontrolobserver.h> #include <QMutex> diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index 034ef8bfe..a43dc3415 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -20,7 +20,7 @@ #ifndef VERSIONCONTROLOBSERVER_H #define VERSIONCONTROLOBSERVER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <KFileItem> #include <QUrl> diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h index 9ea717ad3..89f1020b5 100644 --- a/src/views/viewmodecontroller.h +++ b/src/views/viewmodecontroller.h @@ -22,7 +22,7 @@ #include <QUrl> #include <QObject> -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <views/dolphinview.h> /** diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h index d3ea4280f..b9c2fa546 100644 --- a/src/views/viewproperties.h +++ b/src/views/viewproperties.h @@ -23,7 +23,7 @@ #include <views/dolphinview.h> #include <QUrl> -#include <libdolphin_export.h> +#include "libdolphin_export.h" class ViewPropertySettings; /** |