Use private export symbole

autotests/CMakeLists.txt

@@ -2,21 +2,9 @@
 include_directories(${kdebugsettings_BINARY_DIR}/src ${kdebugsettings_BINARY_DIR})
 add_definitions( -DKDEBUGSETTINGS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
 
-set(full_source_file
-    ../src/kdebugsettingsdialog.cpp
-    ../src/customdebugsettingspage.cpp
-    ../src/kdeapplicationdebugsettingpage.cpp
-    ../src/configurecustomsettingdialog.cpp
-    ../src/configurecustomsettingwidget.cpp
-    ../src/environmentsettingsrulespage.cpp
-    ../src/kdeapplicationtreelistwidget.cpp
-    ../src/categorywarning.cpp
-    ${CMAKE_BINARY_DIR}/src/kdebugsettings_debug.cpp
-    )
-
 # convenience macro to add qtest unit tests
 macro(add_unittest _source _additionalsource)
-    set(_test ${_source} ${_additionalsource} "../src/kdebugsettings_debug.cpp")
+    set(_test ${_source} ${_additionalsource})
     get_filename_component(_name ${_source} NAME_WE)
     add_executable( ${_name} ${_test} )
     add_test(NAME ${_name} COMMAND ${_name} )
@@ -33,16 +21,16 @@ macro(add_unittest _source _additionalsource)
         )
 endmacro ()
 
-add_unittest( kdebugsettingsdialogtest.cpp "${full_source_file}")
-add_unittest( kdeapplicationdebugsettingpagetest.cpp "../src/kdeapplicationdebugsettingpage.cpp;../src/kdeapplicationtreelistwidget.cpp")
-add_unittest( customdebugsettingspagetest.cpp "../src/customdebugsettingspage.cpp;../src/configurecustomsettingdialog.cpp;../src/configurecustomsettingwidget.cpp")
-add_unittest( configurecustomsettingdialogtest.cpp "../src/configurecustomsettingdialog.cpp;../src/configurecustomsettingwidget.cpp")
-add_unittest( configurecustomsettingwidgettest.cpp "../src/configurecustomsettingwidget.cpp")
-add_unittest( environmentsettingsrulespagetest.cpp "../src/environmentsettingsrulespage.cpp")
+add_unittest( kdebugsettingsdialogtest.cpp "")
+add_unittest( kdeapplicationdebugsettingpagetest.cpp "")
+add_unittest( customdebugsettingspagetest.cpp "")
+add_unittest( configurecustomsettingdialogtest.cpp "")
+add_unittest( configurecustomsettingwidgettest.cpp "")
+add_unittest( environmentsettingsrulespagetest.cpp "")
 add_unittest( kdebugsettingutiltest.cpp "")
 add_unittest( categorytypecomboboxtest.cpp "")
-add_unittest( kdeapplicationtreelistwidgettest.cpp "../src/kdeapplicationtreelistwidget.cpp")
-add_unittest( categorywarningtest.cpp "../src/categorywarning.cpp")
+add_unittest( kdeapplicationtreelistwidgettest.cpp "")
+add_unittest( categorywarningtest.cpp "")
 add_unittest( loggingcategorytest.cpp "")
 add_unittest( loadcategoriesjobtest.cpp "")
 add_unittest( renamecategorytest.cpp "")

src/CMakeLists.txt

@@ -17,6 +17,16 @@ set(kdebugsettings_LIB_SRCS
     changedebugmodejob.cpp
     loadgroupmenu.cpp
 
+    kdebugsettingsdialog.cpp
+    customdebugsettingspage.cpp
+    kdeapplicationdebugsettingpage.cpp
+
+    configurecustomsettingdialog.cpp
+    configurecustomsettingwidget.cpp
+    environmentsettingsrulespage.cpp
+    kdeapplicationtreelistwidget.cpp
+    categorywarning.cpp
+
     ${kdebugsettings_debug_SRCS}
     )
 
@@ -29,6 +39,10 @@ target_link_libraries(libkdebugsettings
     Qt5::Core
     KF5::I18n
     Qt5::Widgets
+    KF5::WidgetsAddons
+    KF5::ItemViews
+    KF5::ConfigCore
+    KF5::Completion
 )
 
 set_target_properties(libkdebugsettings
@@ -40,16 +54,6 @@ install(TARGETS libkdebugsettings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NA
 
 set(kdebugsettings_SRCS 
    main.cpp 
-   kdebugsettingsdialog.cpp
-   customdebugsettingspage.cpp
-   kdeapplicationdebugsettingpage.cpp
-
-   configurecustomsettingdialog.cpp
-   configurecustomsettingwidget.cpp
-   environmentsettingsrulespage.cpp
-   kdeapplicationtreelistwidget.cpp
-   categorywarning.cpp
-
    ${kdebugsettings_debug_SRCS}
    )
    
@@ -58,7 +62,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(kdebugsettings PROPERTIES UNITY_BUILD ON)
 endif()
 
-target_link_libraries(kdebugsettings Qt5::Widgets KF5::I18n KF5::DBusAddons KF5::CoreAddons KF5::ConfigCore KF5::WidgetsAddons KF5::ItemViews KF5::Completion libkdebugsettings)
+target_link_libraries(kdebugsettings Qt5::Widgets KF5::I18n KF5::DBusAddons KF5::CoreAddons libkdebugsettings)
 
 install(TARGETS kdebugsettings  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 

src/categorywarning.h

@@ -22,8 +22,8 @@
 #define CATEGORYWARNING_H
 
 #include <KMessageWidget>
-
-class CategoryWarning : public KMessageWidget
+#include "libkdebugsettings_private_export.h"
+class LIBKDEBUGSETTINGS_EXPORT_TEST_EXPORT CategoryWarning : public KMessageWidget
 {
     Q_OBJECT
 public:

src/configurecustomsettingdialog.h

@@ -23,8 +23,10 @@
 
 #include <QDialog>
 #include "kdebugsettingsdialog.h"
+#include "libkdebugsettings_export.h"
+
 class ConfigureCustomSettingWidget;
-class ConfigureCustomSettingDialog : public QDialog
+class LIBKDEBUGSETTINGS_EXPORT ConfigureCustomSettingDialog : public QDialog
 {
     Q_OBJECT
 public:

src/configurecustomsettingwidget.h

@@ -22,10 +22,11 @@
 #define CONFIGURECUSTOMSETTINGWIDGET_H
 
 #include <QWidget>
+#include "libkdebugsettings_private_export.h"
 class KLineEdit;
 class QCheckBox;
 class CategoryTypeComboBox;
-class ConfigureCustomSettingWidget : public QWidget
+class LIBKDEBUGSETTINGS_EXPORT_TEST_EXPORT ConfigureCustomSettingWidget : public QWidget
 {
     Q_OBJECT
 public:

src/customdebugsettingspage.h

@@ -23,9 +23,10 @@
 
 #include <QWidget>
 #include "loggingcategory.h"
+#include "libkdebugsettings_export.h"
 class QListWidget;
 class QPushButton;
-class CustomDebugSettingsPage : public QWidget
+class LIBKDEBUGSETTINGS_EXPORT CustomDebugSettingsPage : public QWidget
 {
     Q_OBJECT
 public:

src/environmentsettingsrulespage.h

@@ -22,8 +22,9 @@
 #define ENVIRONMENTSETTINGSRULESPAGE_H
 
 #include <QWidget>
+#include "libkdebugsettings_private_export.h"
 class EnvironmentPlainTextEdit;
-class EnvironmentSettingsRulesPage : public QWidget
+class LIBKDEBUGSETTINGS_EXPORT_TEST_EXPORT EnvironmentSettingsRulesPage : public QWidget
 {
     Q_OBJECT
 public:

src/kdeapplicationdebugsettingpage.h

@@ -23,10 +23,11 @@
 
 #include <QWidget>
 #include "loggingcategory.h"
+#include "libkdebugsettings_export.h"
 class QPushButton;
 class KDEApplicationTreeListWidget;
 class KTreeWidgetSearchLine;
-class KDEApplicationDebugSettingPage : public QWidget
+class LIBKDEBUGSETTINGS_EXPORT KDEApplicationDebugSettingPage : public QWidget
 {
     Q_OBJECT
 public:

src/kdeapplicationtreelistwidget.h

@@ -23,8 +23,9 @@
 
 #include <QTreeWidget>
 #include "loggingcategory.h"
+#include "libkdebugsettings_private_export.h"
 class CategoryTypeComboBox;
-class KDEApplicationTreeListWidgetItem : public QTreeWidgetItem
+class LIBKDEBUGSETTINGS_EXPORT_TEST_EXPORT KDEApplicationTreeListWidgetItem : public QTreeWidgetItem
 {
 public:
     enum ColumnType {
@@ -49,12 +50,12 @@ private:
     CategoryTypeComboBox *mCategoryTypeCombobox = nullptr;
 };
 
-class KDEApplicationTreeListWidget : public QTreeWidget
+class LIBKDEBUGSETTINGS_EXPORT_TEST_EXPORT KDEApplicationTreeListWidget : public QTreeWidget
 {
     Q_OBJECT
 public:
     explicit KDEApplicationTreeListWidget(QWidget *parent = nullptr);
-    ~KDEApplicationTreeListWidget();
+    ~KDEApplicationTreeListWidget() override;
 
     void deSelectAllDebugCategories();
     void selectAllDebugCategories();

src/kdebugsettingsdialog.h

@@ -25,13 +25,14 @@
 #include "kdebugsettingsloadingcategories.h"
 #include "kdeloggingcategory.h"
 #include "renamecategory.h"
+#include "libkdebugsettings_export.h"
 class QTabWidget;
 class KDEApplicationDebugSettingPage;
 class CustomDebugSettingsPage;
 class EnvironmentSettingsRulesPage;
 class CategoryWarning;
 
-class KDebugSettingsDialog : public QDialog
+class LIBKDEBUGSETTINGS_EXPORT KDebugSettingsDialog : public QDialog
 {
     Q_OBJECT
 public:

src/loadgroupmenu.h

@@ -29,6 +29,8 @@ class LoadGroupMenu : public QMenu
 public:
     explicit LoadGroupMenu(QWidget *parent);
     ~LoadGroupMenu() override;
+private:
+    void init();
 };
 
 #endif // LOADGROUPMENU_H