diff --git a/libs/main/CMakeLists.txt b/libs/main/CMakeLists.txt --- a/libs/main/CMakeLists.txt +++ b/libs/main/CMakeLists.txt @@ -61,7 +61,6 @@ KoFindBase.cpp KoFindMatch.cpp KoFindText.cpp - KoFindToolbar.cpp KoFindOption.cpp KoFindOptionSet.cpp KoFindStyle.cpp @@ -149,7 +148,6 @@ KoFilterVertex.h KoFindBase.h KoFindText.h - KoFindToolbar.h KoFindMatch.h KoFindOption.h KoFindOptionSet.h diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt --- a/words/part/CMakeLists.txt +++ b/words/part/CMakeLists.txt @@ -45,6 +45,8 @@ frames/KWTextFrameSet.cpp frames/KWCopyShape.cpp + widgets/KoFindToolbar.cpp + dialogs/KWFrameConnectSelector.cpp dialogs/KWRunAroundProperties.cpp dialogs/KWAnchoringProperties.cpp diff --git a/words/part/KWView.cpp b/words/part/KWView.cpp --- a/words/part/KWView.cpp +++ b/words/part/KWView.cpp @@ -39,6 +39,7 @@ #include "dialogs/KWSelectBookmarkDialog.h" #include "dialogs/KWConfigureDialog.h" #include "commands/KWShapeCreateCommand.h" +#include "widgets/KoFindToolbar.h" #include "ui_KWInsertImage.h" #include "gemini/ViewModeSwitchEvent.h" #include "WordsDebug.h" @@ -93,7 +94,6 @@ #include #include -#include #include #include diff --git a/libs/main/KoFindToolbar.h b/words/part/widgets/KoFindToolbar.h rename from libs/main/KoFindToolbar.h rename to words/part/widgets/KoFindToolbar.h --- a/libs/main/KoFindToolbar.h +++ b/words/part/widgets/KoFindToolbar.h @@ -24,7 +24,6 @@ #define KOFINDTOOLBAR_H #include -#include "komain_export.h" class KActionCollection; class KoFindBase; @@ -35,7 +34,7 @@ * field, previous/next buttons and an options selector. It uses the methods * provided by KoFindBase to find and navigate search matches. */ -class KOMAIN_EXPORT KoFindToolbar : public QWidget +class KoFindToolbar : public QWidget { Q_OBJECT public: diff --git a/libs/main/KoFindToolbar.cpp b/words/part/widgets/KoFindToolbar.cpp rename from libs/main/KoFindToolbar.cpp rename to words/part/widgets/KoFindToolbar.cpp --- a/libs/main/KoFindToolbar.cpp +++ b/words/part/widgets/KoFindToolbar.cpp @@ -22,13 +22,13 @@ #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/libs/main/KoFindToolbar_p.h b/words/part/widgets/KoFindToolbar_p.h rename from libs/main/KoFindToolbar_p.h rename to words/part/widgets/KoFindToolbar_p.h