Fix Exports.

REVIEW: 121078
2024-07-15 18:01:11 +00:00 · 2014-11-08 19:50:38 -02:00 · 2014-11-08 19:50:38 -02:00 · e1789b559e
parent c79eb81a34
commit e1789b559e
39 changed files with 38 additions and 78 deletions
--- 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>

--- 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>

--- 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>
--- 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>
--- 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>

--- 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"

--- 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>

--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>

--- 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>

--- 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>

--- 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>
--- 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>
--- 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>

--- 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;
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- a/src/libdolphin_export.h
+++ b/src/libdolphin_export.h
@ -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
--- 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"),
--- 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>
--- 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;

--- 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>
--- 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>
--- 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>

 /**
--- 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;
 /**