]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix Exports.
authorAndrius da Costa Ribas <andriusmao@gmail.com>
Sat, 8 Nov 2014 21:50:38 +0000 (19:50 -0200)
committerAndrius da Costa Ribas <andriusmao@gmail.com>
Thu, 20 Nov 2014 03:06:58 +0000 (01:06 -0200)
REVIEW: 121078

39 files changed:
src/kitemviews/kfileitemlistview.h
src/kitemviews/kfileitemlistwidget.h
src/kitemviews/kfileitemmodel.h
src/kitemviews/kfileitemmodelrolesupdater.h
src/kitemviews/kitemlistcontainer.h
src/kitemviews/kitemlistcontroller.h
src/kitemviews/kitemlistgroupheader.h
src/kitemviews/kitemlistheader.h
src/kitemviews/kitemlistselectionmanager.h
src/kitemviews/kitemliststyleoption.h
src/kitemviews/kitemlistview.h
src/kitemviews/kitemlistviewaccessible.h
src/kitemviews/kitemlistwidget.h
src/kitemviews/kitemmodelbase.h
src/kitemviews/kstandarditem.h
src/kitemviews/kstandarditemlistgroupheader.h
src/kitemviews/kstandarditemlistview.h
src/kitemviews/kstandarditemlistwidget.h
src/kitemviews/kstandarditemmodel.h
src/kitemviews/private/kbaloorolesprovider.h
src/kitemviews/private/kfileitemmodeldirlister.h
src/kitemviews/private/kfileitemmodelfilter.h
src/kitemviews/private/kitemlistheaderwidget.h
src/kitemviews/private/kitemlistkeyboardsearchmanager.h
src/kitemviews/private/kitemlistrubberband.h
src/kitemviews/private/kitemlistselectiontoggle.h
src/kitemviews/private/kitemlistsizehintresolver.h
src/kitemviews/private/kitemlistsmoothscroller.h
src/kitemviews/private/kitemlistviewanimation.h
src/kitemviews/private/kitemlistviewlayouter.h
src/kitemviews/private/kpixmapmodifier.h
src/libdolphin_export.h [deleted file]
src/main.cpp
src/views/dolphinfileitemlistwidget.h
src/views/dolphinitemlistview.h
src/views/versioncontrol/updateitemstatesthread.h
src/views/versioncontrol/versioncontrolobserver.h
src/views/viewmodecontroller.h
src/views/viewproperties.h

index 9f07c9d8da7a1f0c4719fd5495417c9d7f10685e..72688893e861147db20da42c33d586a17c5332fe 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KFILEITEMLISTVIEW_H
 #define KFILEITEMLISTVIEW_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kstandarditemlistview.h>
 
index b7061d38c59ecd36a74fcfe129be39cce887bf2c..32959e4f6259ea45662a045b3680da6e96fc13f0 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KFILEITEMLISTWIDGET_H
 #define KFILEITEMLISTWIDGET_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kstandarditemlistwidget.h>
 
index 535e0f3e4b18a02f74327c04903810b6c2a4f531..d98d4538dc8a3a2621a2c3386da2ab7e89976ad5 100644 (file)
@@ -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>
index e8b186a969a02c2be218f30b289c6e99843f9ee5..6c82dbe4ae552f9b85055a29711f78b755dfc114 100644 (file)
@@ -25,7 +25,7 @@
 #include <KFileItem>
 #include <kitemviews/kitemmodelbase.h>
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QObject>
 #include <QSet>
index 55a9a118f142ad1db45eda9024118c64dfb74b09..6f2851b3e7814b5ba987fdfd706897577432772f 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef KITEMLISTCONTAINER_H
 #define KITEMLISTCONTAINER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QAbstractScrollArea>
 
index 99df531042d8800ee439de32b2e681d2627f9ec6..ed5b71615d64e243294e9cf16fdb9385d7415f10 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef KITEMLISTCONTROLLER_H
 #define KITEMLISTCONTROLLER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include "kitemset.h"
 
index 66fe929ddd3c9a39b05e0dc88f22a40b52238990..c89da50274aade92fef0e7f2405acd37cbb61781 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTGROUPHEADER_H
 #define KITEMLISTGROUPHEADER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kitemliststyleoption.h>
 
index fe2d0ac1052d590157b8780aae7c3e591a208269..b361b912bacbe5b474a2047383966e529ab06936 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTHEADER_H
 #define KITEMLISTHEADER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 #include <QHash>
 #include <QObject>
 
index c4decd39eb3d07e49058d73b6b30259c843a77e2..a8318388ca65f781037d435657da5f26ac946801 100644 (file)
@@ -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>
index 782dd0ec2f93129f01568871601bca8f1df216c1..9290dc34196426a5c17b05ebd0ec3681fb46493b 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTSTYLEOPTION_H
 #define KITEMLISTSTYLEOPTION_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QFont>
 #include <QFontMetrics>
index cc0754f2a18f70d4288af6ddc1e9a9dd137545e3..8130e45ed008a858bca2388c860a54b1c1b0ae93 100644 (file)
@@ -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>
index 674f1d1af2bb943dc38683d67536caad0d9d47e4..87cf4b9faedf6a2e348e4fb546c2b457cee1893d 100644 (file)
@@ -22,7 +22,7 @@
 
 #ifndef QT_NO_ACCESSIBILITY
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QtCore/qpointer.h>
 #include <QtGui/qaccessible.h>
index 07fc789f0ace3e71bb9522d53c0670b0ecde23b9..723847c43a06966523332fe1dceb98e7be80b380 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef KITEMLISTWIDGET_H
 #define KITEMLISTWIDGET_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kitemliststyleoption.h>
 
index 283cfa5523b363fbe72996b27c40b8c7f4ec1538..e46d761fc63fcb9a91dc1add69a632d07c796d9b 100644 (file)
@@ -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>
index 59190bfd5d1772cbcbdabb5e762f4df47c38a7c9..b1d5edf2e055e21f774330e263673636076a330c 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KSTANDARDITEM_H
 #define KSTANDARDITEM_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QByteArray>
 #include <QHash>
index 871c93d8d7fedba5d72d5ccf51ed483c1d081c92..caf906ddf4c31c3a290555f5ea91932583d83092 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KSTANDARDITEMLISTGROUPHEADER_H
 #define KSTANDARDITEMLISTGROUPHEADER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kitemlistgroupheader.h>
 
index eb07c7f08a87e92d3f5f3eae58b50fca6b8c1e5e..9fc43a940e6b34ebf83a0950911bb7442dc95278 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KSTANDARDITEMLISTVIEW_H
 #define KSTANDARDITEMLISTVIEW_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kitemlistview.h>
 
index 7683f84331b88af0992ea1045abf934d606837ac..8e61d06b414c307f33296e6a97d6dd5c44f426d2 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KSTANDARDITEMLISTWIDGET_H
 #define KSTANDARDITEMLISTWIDGET_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kitemlistwidget.h>
 
index 9d1db1a2b4b272874610d3381752ea5eaa8f5e43..3b5f5bd393d6316aaf905f3b639f53ea09bb454c 100644 (file)
@@ -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>
index f1ad5c74070957d5d2be5c21d7a31e53e5eb453b..08d564d65f70fe063cd4236e23e17123647bee87 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KBALOO_ROLESPROVIDER_H
 #define KBALOO_ROLESPROVIDER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QHash>
 #include <QSet>
index 94a0e39fd6dda436b7aed7a011320bd9a451a741..a9c8c845a07179070f850a26f67d1511367bd862 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KFILEITEMMODELDIRLISTER_H
 #define KFILEITEMMODELDIRLISTER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 #include <KDirLister>
 #include <QUrl>
 
index e4fb0a2ee54568ac983b8930865a2b249e7bb1f2..b26e31a00582f9108c3b056df8da1da341621552 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef KFILEITEMMODELFILTER_H
 #define KFILEITEMMODELFILTER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 #include <QStringList>
 
 class KFileItem;
index b99f45f354e7e861cde72c1fffa486583c97c120..74c9ac5182c1fb2d68532cdf6453310505187793 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTHEADERWIDGET_H
 #define KITEMLISTHEADERWIDGET_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 #include <QGraphicsWidget>
 #include <QHash>
 #include <QList>
index 661178db8b9f05faca14ecd23c83a7333014240c..1f315dabd3c2f7df792db78a4c6cb153c4b4cc43 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef KITEMLISTKEYBOARDSEARCHMANAGER_H
 #define KITEMLISTKEYBOARDSEARCHMANAGER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QObject>
 #include <QString>
index aea58af46e9bce9c3131b0ea93d37ab704c4a86d..39c7573aea6ab4cb9b65f8bb795cd2ab294cd6c7 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTRUBBERBAND_H
 #define KITEMLISTRUBBERBAND_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 #include <QObject>
 #include <QPointF>
 
index 8a1a857f6fad2620c009eab1b017d039e53859e3..bd64879afcf67bc2c6978560ac24d89a3b48505a 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTSELECTIONTOGGLE_H
 #define KITEMLISTSELECTIONTOGGLE_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QGraphicsWidget>
 #include <QPixmap>
index a0ad033f31f1c55f29b621831b7142d794b1b349..3bd2319dd0f7f82158a04179dfebd8159b46b679 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTSIZEHINTRESOLVER_H
 #define KITEMLISTSIZEHINTRESOLVER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <kitemviews/kitemmodelbase.h>
 #include <QSizeF>
index ea56822085aaa1967a936a8db04f2f60bf722fbe..963cf7b249a11a77e59e773cce7d6bad525ff4f5 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTSMOOTHSCROLLER_H
 #define KITEMLISTSMOOTHSCROLLER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QAbstractAnimation>
 #include <QObject>
index e2e53385037fbad6282431b95eb4f7558aaf6e3b..ee4a08bce24ea2badf66403438aeb725a24a2d70 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTVIEWANIMATION_H
 #define KITEMLISTVIEWANIMATION_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QHash>
 #include <QObject>
index 0efcab12b11c86d6374d0f102ab78a7df4cec748..fc82d6061ddf737fe2e435ca272c3e85941f7c13 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef KITEMLISTVIEWLAYOUTER_H
 #define KITEMLISTVIEWLAYOUTER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <QObject>
 #include <QRectF>
index 4f863c349e9e763e21613345870c066868d967d3..b5eec65426abab34b439caca8288e6722150f045 100644 (file)
@@ -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 (file)
index ff0f125..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-   This file is part of the KDE project
-   Copyright (C) 2007 Montel Laurent <montel@kde.org>
-
-   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
index 91d32a08ade4e6254e441d46fad8839afce2cc48..bcd19d4d202a4d56b2b9cee325235a552f002557 100644 (file)
 #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"),
index 5f7c181e9d7c0f1e90a5e9daa77e6f7fa2fed647..5f9cc3a5ab42d7cc406426c9cf76ca8eb64d7ed8 100644 (file)
@@ -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>
index 7fd72e5c0e74525cbc93d7ad3934856a37cd8fe6..2b16825f4f244bd29f110a9f500857a99e123d4a 100644 (file)
@@ -23,7 +23,7 @@
 #include <kitemviews/kfileitemlistview.h>
 #include <settings/viewmodes/viewmodesettings.h>
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 class KFileItemListView;
 
index 9b744d5b3412c7fdf696a7ee4949643a3897bc37..92a9d59c9d5c92219839220c6fc80b6ba1a4033b 100644 (file)
@@ -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>
index 034ef8bfe37645c44a3d8e4c616ae6a76e0d21c0..a43dc3415e313dac5eb24344624ecdbcbff454de 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef VERSIONCONTROLOBSERVER_H
 #define VERSIONCONTROLOBSERVER_H
 
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 #include <KFileItem>
 #include <QUrl>
index 9ea717ad34c1ae6bb258828884c953641bb67cea..89f1020b556da69c6a761c2390b751ff5075683d 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <QUrl>
 #include <QObject>
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 #include <views/dolphinview.h>
 
 /**
index d3ea4280f1e5bcfaf6f90c2a40e0cf843439ef16..b9c2fa546737378af587d63264c903e15c367cf3 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <views/dolphinview.h>
 #include <QUrl>
-#include <libdolphin_export.h>
+#include "libdolphin_export.h"
 
 class ViewPropertySettings;
 /**