Move libmuonapt within the ApplicationsBackend

16 files changed, 7 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fb9e28..51e391c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ configure_file(MuonVersion.h.in MuonVersion.h)
 
 add_subdirectory(libmuon)
 if(QApt_FOUND)
-    add_subdirectory(libmuonapt)
     add_subdirectory(muon)
 endif()
 add_subdirectory(updater)
diff --git a/libmuon/backends/ApplicationBackend/CMakeLists.txt b/libmuon/backends/ApplicationBackend/CMakeLists.txt
index b90ee44..19a006f 100644
--- a/libmuon/backends/ApplicationBackend/CMakeLists.txt
+++ b/libmuon/backends/ApplicationBackend/CMakeLists.txt
@@ -1,6 +1,7 @@
 # we will have our own fork of the library now, because they haven't still made their mind out of Qt5
 # find_package(QtOAuth REQUIRED)
 add_subdirectory(qoauth)
+add_subdirectory(libmuonapt)
 
 include_directories(.)
 
diff --git a/libmuonapt/AddRepositoryHelper.cpp b/libmuon/backends/ApplicationBackend/libmuonapt/AddRepositoryHelper.cpp
index fe78f4d..fe78f4d 100644
--- a/libmuonapt/AddRepositoryHelper.cpp
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/AddRepositoryHelper.cpp
diff --git a/libmuonapt/AddRepositoryHelper.h b/libmuon/backends/ApplicationBackend/libmuonapt/AddRepositoryHelper.h
index 15d9506..15d9506 100644
--- a/libmuonapt/AddRepositoryHelper.h
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/AddRepositoryHelper.h
diff --git a/libmuonapt/CMakeLists.txt b/libmuon/backends/ApplicationBackend/libmuonapt/CMakeLists.txt
index fe3928c..8bcf603 100644
--- a/libmuonapt/CMakeLists.txt
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/CMakeLists.txt
@@ -1,14 +1,11 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"libmuon\")
 
-set(muonapt_SRCS
-    ChangesDialog.cpp
+add_library(MuonApt STATIC ChangesDialog.cpp
     MuonStrings.cpp
     QAptActions.cpp
     HistoryView/HistoryProxyModel.cpp
-    HistoryView/HistoryView.cpp
-)
+    HistoryView/HistoryView.cpp)
 
-add_library(MuonApt ${muonapt_SRCS})
 target_link_libraries(MuonApt Qt5::Core
      KF5::Solid KF5::KIOWidgets KF5::XmlGui
      QApt::Main KF5::I18n
@@ -27,4 +24,3 @@ kauth_install_helper_files(muon_repo_helper org.kde.muon.repo root)
 
 install(TARGETS MuonApt ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-generate_export_header(MuonApt EXPORT_FILE_NAME libMuonApt_export.h)
diff --git a/libmuonapt/ChangesDialog.cpp b/libmuon/backends/ApplicationBackend/libmuonapt/ChangesDialog.cpp
index 11b3426..11b3426 100644
--- a/libmuonapt/ChangesDialog.cpp
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/ChangesDialog.cpp
diff --git a/libmuonapt/ChangesDialog.h b/libmuon/backends/ApplicationBackend/libmuonapt/ChangesDialog.h
index 12d08c0..ed17c46 100644
--- a/libmuonapt/ChangesDialog.h
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/ChangesDialog.h
@@ -28,11 +28,9 @@
 // QApt includes
 #include <QApt/Package>
 
-#include "libMuonApt_export.h"
-
 class QStandardItemModel;
 
-class MUONAPT_EXPORT ChangesDialog : public QDialog
+class ChangesDialog : public QDialog
 {
 public:
     ChangesDialog(QWidget *parent, const QApt::StateChanges &changes);
diff --git a/libmuonapt/HistoryView/HistoryProxyModel.cpp b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryProxyModel.cpp
index 96f9fac..96f9fac 100644
--- a/libmuonapt/HistoryView/HistoryProxyModel.cpp
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryProxyModel.cpp
diff --git a/libmuonapt/HistoryView/HistoryProxyModel.h b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryProxyModel.h
index a5fc1e7..a5fc1e7 100644
--- a/libmuonapt/HistoryView/HistoryProxyModel.h
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryProxyModel.h
diff --git a/libmuonapt/HistoryView/HistoryView.cpp b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryView.cpp
index 33d5e5d..33d5e5d 100644
--- a/libmuonapt/HistoryView/HistoryView.cpp
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryView.cpp
diff --git a/libmuonapt/HistoryView/HistoryView.h b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryView.h
index 1bffae6..f63b85b 100644
--- a/libmuonapt/HistoryView/HistoryView.h
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/HistoryView/HistoryView.h
@@ -25,8 +25,6 @@
 
 #include <QWidget>
 
-#include "libMuonApt_export.h"
-
 class QStandardItem;
 class QStandardItemModel;
 class QTimer;
@@ -40,7 +38,7 @@ namespace QApt {
 
 class HistoryProxyModel;
 
-class MUONAPT_EXPORT HistoryView : public QWidget
+class HistoryView : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/libmuonapt/MuonStrings.cpp b/libmuon/backends/ApplicationBackend/libmuonapt/MuonStrings.cpp
index 1138610..1138610 100644
--- a/libmuonapt/MuonStrings.cpp
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/MuonStrings.cpp
diff --git a/libmuonapt/MuonStrings.h b/libmuon/backends/ApplicationBackend/libmuonapt/MuonStrings.h
index c7a3b14..1a0f13d 100644
--- a/libmuonapt/MuonStrings.h
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/MuonStrings.h
@@ -25,13 +25,11 @@
 
 #include <QApt/Package>
 
-#include "libMuonApt_export.h"
-
 namespace QApt {
     class Transaction;
 }
 
-class MUONAPT_EXPORT MuonStrings : public QObject
+class MuonStrings : public QObject
 {
     Q_OBJECT
 public:
diff --git a/libmuonapt/QAptActions.cpp b/libmuon/backends/ApplicationBackend/libmuonapt/QAptActions.cpp
index 12d79cd..12d79cd 100644
--- a/libmuonapt/QAptActions.cpp
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/QAptActions.cpp
diff --git a/libmuonapt/QAptActions.h b/libmuon/backends/ApplicationBackend/libmuonapt/QAptActions.h
index 27ed7e7..a739e3b 100644
--- a/libmuonapt/QAptActions.h
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/QAptActions.h
@@ -26,8 +26,6 @@
 
 #include <QApt/Globals>
 
-#include "libMuonApt_export.h"
-
 class KXmlGuiWindow;
 class KDialog;
 class KXmlGuiWindow;
@@ -41,7 +39,7 @@ namespace QApt {
     class Transaction;
 }
 
-class MUONAPT_EXPORT QAptActions : public QObject
+class QAptActions : public QObject
 {
     Q_OBJECT
 public:
diff --git a/libmuonapt/policies/org.kde.muon.repo.action b/libmuon/backends/ApplicationBackend/libmuonapt/policies/org.kde.muon.repo.action
index dd6ad20..dd6ad20 100644
--- a/libmuonapt/policies/org.kde.muon.repo.action
+++ b/libmuon/backends/ApplicationBackend/libmuonapt/policies/org.kde.muon.repo.action