Move util/htmlreport util/helpers to kpmgui library.

This commit is contained in:
Andrius Štikonas 2015-03-28 18:23:53 +00:00
parent 8e5c1b1ebd
commit 2b7d2ff377
5 changed files with 20 additions and 15 deletions

View File

@ -53,6 +53,7 @@ find_package(KF5 REQUIRED
IconThemes
JobWidgets
KIO
Service
XmlGui
WidgetsAddons
)

View File

@ -28,14 +28,15 @@ set(kpmcore_SRCS
${BACKEND_SRC}
${FS_SRC}
${CORE_SRC}
${UTIL_SRC}
${OPS_SRC}
${JOBS_SRC}
${UTIL_SRC}
)
set(kpmgui_SRCS
${CONFIG_SRC}
${GUI_SRC}
${UTILGUI_SRC}
)
file(GLOB kpmcore_UIFILES config/*.ui)
@ -58,7 +59,7 @@ target_link_libraries( kpmcore libfatlabel
KF5::I18n
KF5::IconThemes
KF5::KIOCore
KF5::WidgetsAddons
KF5::Service
)
add_library(kpmgui SHARED ${kpmgui_SRCS})
@ -67,6 +68,7 @@ target_link_libraries( kpmgui
kpmcore
KF5::JobWidgets
KF5::KIOWidgets
KF5::WidgetsAddons
KF5::XmlGui
)

View File

@ -70,7 +70,7 @@ class QIcon;
@author Volker Lanz <vl@fidra.de>
*/
class Operation : public QObject
class LIBKPMCORE_EXPORT Operation : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(Operation)

View File

@ -1,8 +1,11 @@
set(UTIL_SRC
util/capacity.cpp
util/report.cpp
util/helpers.cpp
util/globallog.cpp
util/externalcommand.cpp
util/globallog.cpp
util/report.cpp
)
set(UTILGUI_SRC
util/helpers.cpp
util/htmlreport.cpp
)

View File

@ -19,7 +19,7 @@
#define HELPERS__H
#include "util/libpartitionmanagerexport.h"
#include "util/libpartitionmanagerguiexport.h"
#include "fs/filesystem.h"
@ -29,18 +29,17 @@ class QIcon;
class QPoint;
class QTreeWidget;
LIBKPMGUI_EXPORT void registerMetaTypes();
LIBKPMGUI_EXPORT bool checkPermissions();
LIBKPMCORE_EXPORT void registerMetaTypes();
LIBKPMCORE_EXPORT bool checkPermissions();
LIBKPMGUI_EXPORT bool caseInsensitiveLessThan(const QString& s1, const QString& s2);
LIBKPMCORE_EXPORT bool caseInsensitiveLessThan(const QString& s1, const QString& s2);
LIBKPMGUI_EXPORT QIcon createFileSystemColor(FileSystem::Type type, quint32 size);
LIBKPMCORE_EXPORT QIcon createFileSystemColor(FileSystem::Type type, quint32 size);
LIBKPMGUI_EXPORT void showColumnsContextMenu(const QPoint& p, QTreeWidget& tree);
LIBKPMCORE_EXPORT void showColumnsContextMenu(const QPoint& p, QTreeWidget& tree);
LIBKPMGUI_EXPORT bool loadBackend();
LIBKPMCORE_EXPORT bool loadBackend();
LIBKPMCORE_EXPORT bool checkAccessibleDevices();
LIBKPMGUI_EXPORT bool checkAccessibleDevices();
#endif