[libraries/ktextaddons/2.1] /: Move textautogenerateflowlayout -> textaddonswidgets/layout/textaddonswidgetflowlayout
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 41dc1cd5e2402025757e9fd9f7d09a1d39e88053 by Laurent Montel.
Committed on 17/07/2026 at 11:32.
Pushed by mlaurent into branch '2.1'.
Move textautogenerateflowlayout -> textaddonswidgets/layout/textaddonswidgetflowlayout
Reduce duplicate code
M +15 -0 textaddonswidgets/CMakeLists.txt
R +24 -24 textaddonswidgets/layout/textaddonswidgetflowlayout.cpp [from: textautogeneratetext/widgets/common/textautogenerateflowlayout.cpp - 072% similarity]
R +10 -10 textaddonswidgets/layout/textaddonswidgetflowlayout.h [from: textautogeneratetext/widgets/common/textautogenerateflowlayout.h - 072% similarity]
M +0 -2 textautogeneratetext/CMakeLists.txt
M +2 -2 textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelavailableinfowidget.cpp
M +3 -3 textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelinstalledinfowidget.cpp
M +3 -3 textautogeneratetext/plugins/ollamacommon/ollamacommonmodelavailableinfowidget.cpp
M +2 -2 textautogeneratetext/widgets/autotests/textautogeneratetextlineeditattachmentwidgettest.cpp
M +2 -2 textautogeneratetext/widgets/autotests/textautogeneratetoolswidgettest.cpp
M +2 -2 textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.cpp
M +5 -1 textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.h
M +2 -2 textautogeneratetext/widgets/toolswidget/textautogeneratetoolswidget.cpp
https://invent.kde.org/libraries/ktextaddons/-/commit/41dc1cd5e2402025757e9fd9f7d09a1d39e88053
diff --git a/textaddonswidgets/CMakeLists.txt b/textaddonswidgets/CMakeLists.txt
index 280262c05..759ccec82 100644
--- a/textaddonswidgets/CMakeLists.txt
+++ b/textaddonswidgets/CMakeLists.txt
@@ -101,6 +101,8 @@ target_sources(
completionlineedit/completionlineedit.cpp
model/sortfilterproxymodelbase.h
model/sortfilterproxymodelbase.cpp
+ layout/textaddonswidgetflowlayout.h
+ layout/textaddonswidgetflowlayout.cpp
)
target_sources(
@@ -276,6 +278,14 @@ ecm_generate_headers(TextAddonsWidgets_Camelcasemisc_HEADERS
RELATIVE misc
)
+ecm_generate_headers(TextAddonsWidgets_Camelcaselayout_HEADERS
+ HEADER_NAMES
+ TextAddonsWidgetFlowLayout
+ REQUIRED_HEADERS TextAddonsWidgets_layout_HEADERS
+ PREFIX TextAddonsWidgets
+ RELATIVE layout
+)
+
set(TEXTAUTOGENERATE_INCLUDES_FILES
${TextAddonsWidgets_HEADERS}
${TextAddonsWidgets_needupdateversionwidgets_HEADERS}
@@ -287,6 +297,7 @@ set(TEXTAUTOGENERATE_INCLUDES_FILES
${TextAddonsWidgets_whatsnewng_HEADERS}
${TextAddonsWidgets_completionlineedit_HEADERS}
${TextAddonsWidgets_model_HEADERS}
+ ${TextAddonsWidgets_layout_HEADERS}
)
install(
@@ -308,6 +319,7 @@ install(
${TextAddonsWidgets_Camelcasewhatsnewng_HEADERS}
${TextAddonsWidgets_Camelcasecompletionlineedit_HEADERS}
${TextAddonsWidgets_Camelcasemodel_HEADERS}
+ ${TextAddonsWidgets_Camelcaselayout_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/TextAddonsWidgets/TextAddonsWidgets/
COMPONENT Devel
)
@@ -373,5 +385,8 @@ ecm_installed_library_check_include_strings(KF6TextAddonsWidgets
${TextAddonsWidgets_Camelcaseplugins_HEADERS}
${TextAddonsWidgets_Camelcasemisc_HEADERS}
${TextAddonsWidgets_Camelcasewhatsnewng_HEADERS}
+ ${TextAddonsWidgets_Camelcasecompletionlineedit_HEADERS}
+ ${TextAddonsWidgets_Camelcasemodel_HEADERS}
+ ${TextAddonsWidgets_Camelcaselayout_HEADERS}
PREFIX TextAddonsWidgets
)
diff --git a/textautogeneratetext/widgets/common/textautogenerateflowlayout.cpp b/textaddonswidgets/layout/textaddonswidgetflowlayout.cpp
similarity index 72%
rename from textautogeneratetext/widgets/common/textautogenerateflowlayout.cpp
rename to textaddonswidgets/layout/textaddonswidgetflowlayout.cpp
index 9cbed9921..2f1813fd9 100644
--- a/textautogeneratetext/widgets/common/textautogenerateflowlayout.cpp
+++ b/textaddonswidgets/layout/textaddonswidgetflowlayout.cpp
@@ -4,12 +4,12 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
-#include "textautogenerateflowlayout.h"
-#include "textautogeneratetextwidget_debug.h"
+#include "textaddonswidgetflowlayout.h"
+#include "textaddonswidgets_debug.h"
#include <QStyle>
#include <QWidget>
-using namespace TextAutoGenerateText;
+using namespace TextAddonsWidgets;
static int smartSpacing(QObject *parent, QStyle::PixelMetric pm)
{
if (!parent) {
@@ -22,17 +22,17 @@ static int smartSpacing(QObject *parent, QStyle::PixelMetric pm)
}
}
-TextAutoGenerateFlowLayout::TextAutoGenerateFlowLayout(QWidget *parent)
+TextAddonsWidgetFlowLayout::TextAddonsWidgetFlowLayout(QWidget *parent)
: QLayout(parent)
{
}
-TextAutoGenerateFlowLayout::~TextAutoGenerateFlowLayout()
+TextAddonsWidgetFlowLayout::~TextAddonsWidgetFlowLayout()
{
clear();
}
-int TextAutoGenerateFlowLayout::horizontalSpacing() const
+int TextAddonsWidgetFlowLayout::horizontalSpacing() const
{
if (mHorizontalSpacing >= 0) {
return mHorizontalSpacing;
@@ -41,7 +41,7 @@ int TextAutoGenerateFlowLayout::horizontalSpacing() const
}
}
-void TextAutoGenerateFlowLayout::setHorizontalSpacing(int horizontalSpacing)
+void TextAddonsWidgetFlowLayout::setHorizontalSpacing(int horizontalSpacing)
{
if (mHorizontalSpacing != horizontalSpacing) {
mHorizontalSpacing = horizontalSpacing;
@@ -49,7 +49,7 @@ void TextAutoGenerateFlowLayout::setHorizontalSpacing(int horizontalSpacing)
}
}
-int TextAutoGenerateFlowLayout::verticalSpacing() const
+int TextAddonsWidgetFlowLayout::verticalSpacing() const
{
if (mVerticalSpacing >= 0) {
return mVerticalSpacing;
@@ -58,7 +58,7 @@ int TextAutoGenerateFlowLayout::verticalSpacing() const
}
}
-void TextAutoGenerateFlowLayout::setVerticalSpacing(int verticalSpacing)
+void TextAddonsWidgetFlowLayout::setVerticalSpacing(int verticalSpacing)
{
if (mVerticalSpacing != verticalSpacing) {
mVerticalSpacing = verticalSpacing;
@@ -66,12 +66,12 @@ void TextAutoGenerateFlowLayout::setVerticalSpacing(int verticalSpacing)
}
}
-QSize TextAutoGenerateFlowLayout::sizeHint() const
+QSize TextAddonsWidgetFlowLayout::sizeHint() const
{
return minimumSize();
}
-QSize TextAutoGenerateFlowLayout::minimumSize() const
+QSize TextAddonsWidgetFlowLayout::minimumSize() const
{
const QMargins margins = contentsMargins();
QSize size;
@@ -84,20 +84,20 @@ QSize TextAutoGenerateFlowLayout::minimumSize() const
return size;
}
-void TextAutoGenerateFlowLayout::addItem(QLayoutItem *item)
+void TextAddonsWidgetFlowLayout::addItem(QLayoutItem *item)
{
if (!item) {
return;
}
if (mItems.contains(item)) {
- qCWarning(TEXTAUTOGENERATETEXT_WIDGET_LOG) << "Item already added to layout";
+ qCWarning(TEXTADDONSWIDGETS_LOG) << "Item already added to layout";
return;
}
mItems.append(item);
invalidate();
}
-QLayoutItem *TextAutoGenerateFlowLayout::itemAt(int index) const
+QLayoutItem *TextAddonsWidgetFlowLayout::itemAt(int index) const
{
if (index >= 0 && index < mItems.count()) {
return mItems[index];
@@ -106,7 +106,7 @@ QLayoutItem *TextAutoGenerateFlowLayout::itemAt(int index) const
return nullptr;
}
-QLayoutItem *TextAutoGenerateFlowLayout::takeAt(int index)
+QLayoutItem *TextAddonsWidgetFlowLayout::takeAt(int index)
{
if (index >= 0 && index < mItems.count()) {
auto *it = mItems.takeAt(index);
@@ -117,40 +117,40 @@ QLayoutItem *TextAutoGenerateFlowLayout::takeAt(int index)
return nullptr;
}
-int TextAutoGenerateFlowLayout::count() const
+int TextAddonsWidgetFlowLayout::count() const
{
return mItems.count();
}
-Qt::Orientations TextAutoGenerateFlowLayout::expandingDirections() const
+Qt::Orientations TextAddonsWidgetFlowLayout::expandingDirections() const
{
return {};
}
-bool TextAutoGenerateFlowLayout::hasHeightForWidth() const
+bool TextAddonsWidgetFlowLayout::hasHeightForWidth() const
{
return true;
}
-int TextAutoGenerateFlowLayout::heightForWidth(int width) const
+int TextAddonsWidgetFlowLayout::heightForWidth(int width) const
{
return doFlow(QRect(0, 0, width, 0), false);
}
-void TextAutoGenerateFlowLayout::setGeometry(const QRect &rect)
+void TextAddonsWidgetFlowLayout::setGeometry(const QRect &rect)
{
QLayout::setGeometry(rect);
doFlow(rect, true);
}
-void TextAutoGenerateFlowLayout::clear()
+void TextAddonsWidgetFlowLayout::clear()
{
while (QLayoutItem *item = takeAt(0)) {
delete item;
}
}
-void TextAutoGenerateFlowLayout::clearAndDeleteWidgets()
+void TextAddonsWidgetFlowLayout::clearAndDeleteWidgets()
{
while (QLayoutItem *item = takeAt(0)) {
item->widget()->deleteLater();
@@ -158,7 +158,7 @@ void TextAutoGenerateFlowLayout::clearAndDeleteWidgets()
}
}
-int TextAutoGenerateFlowLayout::doFlow(QRect rect, bool effective) const
+int TextAddonsWidgetFlowLayout::doFlow(QRect rect, bool effective) const
{
const QMargins margins = contentsMargins();
const QRect effectiveRect = rect.adjusted(margins.left(), margins.top(), -margins.right(), -margins.bottom());
@@ -204,4 +204,4 @@ int TextAutoGenerateFlowLayout::doFlow(QRect rect, bool effective) const
return y + highest - rect.y() + margins.bottom();
}
-#include "moc_textautogenerateflowlayout.cpp"
+#include "moc_textaddonswidgetflowlayout.cpp"
diff --git a/textautogeneratetext/widgets/common/textautogenerateflowlayout.h b/textaddonswidgets/layout/textaddonswidgetflowlayout.h
similarity index 72%
rename from textautogeneratetext/widgets/common/textautogenerateflowlayout.h
rename to textaddonswidgets/layout/textaddonswidgetflowlayout.h
index acc54c3ed..2bfcde77d 100644
--- a/textautogeneratetext/widgets/common/textautogenerateflowlayout.h
+++ b/textaddonswidgets/layout/textaddonswidgetflowlayout.h
@@ -4,29 +4,29 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#pragma once
-#include "textautogeneratetext_export.h"
+#include "textaddonswidgets_export.h"
#include <QLayout>
#include <QList>
-namespace TextAutoGenerateText
+namespace TextAddonsWidgets
{
/*!
- * \class TextAutoGenerateText::TextAutoGenerateFlowLayout
- * \brief The TextAutoGenerateFlowLayout class
+ * \class TextAddonsWidgets::TextAddonsWidgetFlowLayout
+ * \brief The TextAddonsWidgetFlowLayout class
* \author Laurent Montel <[email protected]>
* \inmodule TextAutoGenerateText
- * \inheaderfile TextAutoGenerateText/TextAutoGenerateFlowLayout
+ * \inheaderfile TextAddonsWidgets/TextAddonsWidgetFlowLayout
*/
-class TEXTAUTOGENERATETEXT_EXPORT TextAutoGenerateFlowLayout : public QLayout
+class TEXTADDONSWIDGETS_EXPORT TextAddonsWidgetFlowLayout : public QLayout
{
Q_OBJECT
public:
/*!
*/
- explicit TextAutoGenerateFlowLayout(QWidget *parent = nullptr);
+ explicit TextAddonsWidgetFlowLayout(QWidget *parent = nullptr);
/*!
*/
- ~TextAutoGenerateFlowLayout() override;
+ ~TextAddonsWidgetFlowLayout() override;
/*!
*/
@@ -81,8 +81,8 @@ public:
void clearAndDeleteWidgets();
private:
- TEXTAUTOGENERATETEXT_NO_EXPORT void clear();
- TEXTAUTOGENERATETEXT_NO_EXPORT int doFlow(QRect rect, bool effective) const;
+ TEXTADDONSWIDGETS_NO_EXPORT void clear();
+ TEXTADDONSWIDGETS_NO_EXPORT int doFlow(QRect rect, bool effective) const;
QList<QLayoutItem *> mItems;
int mHorizontalSpacing = -1;
int mVerticalSpacing = -1;
diff --git a/textautogeneratetext/CMakeLists.txt b/textautogeneratetext/CMakeLists.txt
index a1c9b7f47..a413685d8 100644
--- a/textautogeneratetext/CMakeLists.txt
+++ b/textautogeneratetext/CMakeLists.txt
@@ -306,8 +306,6 @@ target_sources(
widgets/common/textautogeneratenotinstancefoundwidget.cpp
widgets/common/textautogeneratemodelsearchlineedit.cpp
widgets/common/textautogeneratemodelsearchlineedit.h
- widgets/common/textautogenerateflowlayout.cpp
- widgets/common/textautogenerateflowlayout.h
widgets/common/textautogeneratetextlineeditattachmentwidget.h
widgets/common/textautogeneratetextlineeditattachmentwidget.cpp
widgets/common/textautogeneratetextlineeditattachmentclickablewidget.h
diff --git a/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelavailableinfowidget.cpp b/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelavailableinfowidget.cpp
index b5c22f7fc..8805c8493 100644
--- a/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelavailableinfowidget.cpp
+++ b/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelavailableinfowidget.cpp
@@ -10,12 +10,12 @@
#include "ollamacommonnetworkurlbutton.h"
#include "ollamamanager.h"
#include "ollamamodeldownloadwidget.h"
-#include "widgets/common/textautogenerateflowlayout.h"
#include <KLocalizedString>
#include <QDesktopServices>
#include <QGroupBox>
#include <QLabel>
#include <QVBoxLayout>
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
using namespace Qt::Literals::StringLiterals;
OllamaModelAvailableInfoWidget::OllamaModelAvailableInfoWidget(OllamaManager *manager, QWidget *parent)
@@ -57,7 +57,7 @@ void OllamaModelAvailableInfoWidget::generateWidget(const QModelIndex &index)
auto infoLayout = new QVBoxLayout(mInfoWidget);
auto languagesGroupBox = new QGroupBox(i18n("Languages Supported"), mInfoWidget);
- auto languagesGroupBoxLayout = new TextAutoGenerateText::TextAutoGenerateFlowLayout(languagesGroupBox);
+ auto languagesGroupBoxLayout = new TextAddonsWidgets::TextAddonsWidgetFlowLayout(languagesGroupBox);
const QStringList languages = index.data(OllamaCommonModelAvailableInfosModel::Languages).toStringList();
for (const auto &l : languages) {
const QLocale locale(l);
diff --git a/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelinstalledinfowidget.cpp b/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelinstalledinfowidget.cpp
index 8b9873a37..234cc8431 100644
--- a/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelinstalledinfowidget.cpp
+++ b/textautogeneratetext/plugins/ollama/modelsmanager/ollamamodelinstalledinfowidget.cpp
@@ -6,11 +6,11 @@
#include "ollamamodelinstalledinfowidget.h"
#include "autogeneratetext_ollama_debug.h"
#include "ollamacommonnetworkurlbutton.h"
-#include "widgets/common/textautogenerateflowlayout.h"
#include <KLocalizedString>
#include <QGroupBox>
#include <QLabel>
#include <QVBoxLayout>
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
using namespace Qt::Literals::StringLiterals;
OllamaModelInstalledInfoWidget::OllamaModelInstalledInfoWidget(QWidget *parent)
@@ -99,7 +99,7 @@ void OllamaModelInstalledInfoWidget::setOllamaModelInstalledInfo(const OllamaMod
auto languagesGroupBox = new QGroupBox(i18n("Languages Supported"), mInfoWidget);
infoLayout->addWidget(languagesGroupBox);
- auto vboxLanguagesLayout = new TextAutoGenerateText::TextAutoGenerateFlowLayout(languagesGroupBox);
+ auto vboxLanguagesLayout = new TextAddonsWidgets::TextAddonsWidgetFlowLayout(languagesGroupBox);
const auto languages = info.languages();
for (const auto &lang : languages) {
const QLocale locale(lang);
@@ -122,7 +122,7 @@ void OllamaModelInstalledInfoWidget::setOllamaModelInstalledInfo(const OllamaMod
if (!categoriesName.isEmpty()) {
auto featuresGroupBox = new QGroupBox(i18n("Features Supported"), mInfoWidget);
infoLayout->addWidget(featuresGroupBox);
- auto vboxfeaturesLayout = new TextAutoGenerateText::TextAutoGenerateFlowLayout(featuresGroupBox);
+ auto vboxfeaturesLayout = new TextAddonsWidgets::TextAddonsWidgetFlowLayout(featuresGroupBox);
for (const QString &name : std::as_const(categoriesName)) {
vboxfeaturesLayout->addWidget(new QLabel(name, mInfoWidget));
}
diff --git a/textautogeneratetext/plugins/ollamacommon/ollamacommonmodelavailableinfowidget.cpp b/textautogeneratetext/plugins/ollamacommon/ollamacommonmodelavailableinfowidget.cpp
index 8dd7c61c9..dd1303926 100644
--- a/textautogeneratetext/plugins/ollamacommon/ollamacommonmodelavailableinfowidget.cpp
+++ b/textautogeneratetext/plugins/ollamacommon/ollamacommonmodelavailableinfowidget.cpp
@@ -8,11 +8,11 @@
#include "autogeneratetext_ollamacommon_debug.h"
#include "ollamacommonmodelavailableinfo.h"
#include "ollamacommonnetworkurlbutton.h"
-#include "widgets/common/textautogenerateflowlayout.h"
#include <KLocalizedString>
#include <QGroupBox>
#include <QLabel>
#include <QVBoxLayout>
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
using namespace Qt::Literals::StringLiterals;
OllamaCommonModelAvailableInfoWidget::OllamaCommonModelAvailableInfoWidget(QWidget *parent)
@@ -57,7 +57,7 @@ void OllamaCommonModelAvailableInfoWidget::setOllamaModelAvailableInfo(const Oll
auto languagesGroupBox = new QGroupBox(i18n("Languages Supported"), mInfoWidget);
infoLayout->addWidget(languagesGroupBox);
- auto vboxLanguagesLayout = new TextAutoGenerateText::TextAutoGenerateFlowLayout(languagesGroupBox);
+ auto vboxLanguagesLayout = new TextAddonsWidgets::TextAddonsWidgetFlowLayout(languagesGroupBox);
const auto languages = info.languages();
for (const auto &lang : languages) {
const QLocale locale(lang);
@@ -80,7 +80,7 @@ void OllamaCommonModelAvailableInfoWidget::setOllamaModelAvailableInfo(const Oll
if (!categoriesName.isEmpty()) {
auto featuresGroupBox = new QGroupBox(i18n("Features Supported"), mInfoWidget);
infoLayout->addWidget(featuresGroupBox);
- auto vboxfeaturesLayout = new TextAutoGenerateText::TextAutoGenerateFlowLayout(featuresGroupBox);
+ auto vboxfeaturesLayout = new TextAddonsWidgets::TextAddonsWidgetFlowLayout(featuresGroupBox);
for (const QString &name : std::as_const(categoriesName)) {
vboxfeaturesLayout->addWidget(new QLabel(name, mInfoWidget));
}
diff --git a/textautogeneratetext/widgets/autotests/textautogeneratetextlineeditattachmentwidgettest.cpp b/textautogeneratetext/widgets/autotests/textautogeneratetextlineeditattachmentwidgettest.cpp
index 5808afd4d..293f36347 100644
--- a/textautogeneratetext/widgets/autotests/textautogeneratetextlineeditattachmentwidgettest.cpp
+++ b/textautogeneratetext/widgets/autotests/textautogeneratetextlineeditattachmentwidgettest.cpp
@@ -4,8 +4,8 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "textautogeneratetextlineeditattachmentwidgettest.h"
-#include "widgets/common/textautogenerateflowlayout.h"
#include "widgets/common/textautogeneratetextlineeditattachmentwidget.h"
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
#include <QTest>
using namespace Qt::Literals::StringLiterals;
@@ -19,7 +19,7 @@ void TextAutoGenerateTextLineEditAttachmentWidgetTest::shouldHaveDefaultValues()
{
const TextAutoGenerateText::TextAutoGenerateTextLineEditAttachmentWidget w;
- auto mainLayout = w.findChild<TextAutoGenerateText::TextAutoGenerateFlowLayout *>(u"mainLayout"_s);
+ auto mainLayout = w.findChild<TextAddonsWidgets::TextAddonsWidgetFlowLayout *>(u"mainLayout"_s);
QVERIFY(mainLayout);
QCOMPARE(w.contentsMargins(), QMargins{});
diff --git a/textautogeneratetext/widgets/autotests/textautogeneratetoolswidgettest.cpp b/textautogeneratetext/widgets/autotests/textautogeneratetoolswidgettest.cpp
index fa07b88d8..e6fcb2f1a 100644
--- a/textautogeneratetext/widgets/autotests/textautogeneratetoolswidgettest.cpp
+++ b/textautogeneratetext/widgets/autotests/textautogeneratetoolswidgettest.cpp
@@ -4,10 +4,10 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "textautogeneratetoolswidgettest.h"
-#include "widgets/common/textautogenerateflowlayout.h"
#include "widgets/toolswidget/textautogeneratetoolswidget.h"
#include <QLabel>
#include <QTest>
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
QTEST_MAIN(TextAutoGenerateToolsWidgetTest)
using namespace Qt::Literals::StringLiterals;
TextAutoGenerateToolsWidgetTest::TextAutoGenerateToolsWidgetTest(QObject *parent)
@@ -20,7 +20,7 @@ void TextAutoGenerateToolsWidgetTest::shouldHaveDefaultValues()
const TextAutoGenerateText::TextAutoGenerateToolsWidget w;
QVERIFY(w.generateListOfActiveTools().isEmpty());
- auto mainLayout = w.findChild<TextAutoGenerateText::TextAutoGenerateFlowLayout *>(u"mainLayout"_s);
+ auto mainLayout = w.findChild<TextAddonsWidgets::TextAddonsWidgetFlowLayout *>(u"mainLayout"_s);
QVERIFY(mainLayout);
QCOMPARE(mainLayout->contentsMargins(), QMargins{});
diff --git a/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.cpp b/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.cpp
index b4f93c179..c6cb17f26 100644
--- a/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.cpp
+++ b/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.cpp
@@ -7,12 +7,12 @@
#include "textautogeneratetextlineeditattachmentwidget.h"
#include "textautogeneratetextlineeditattachmentclickablewidget.h"
-#include "widgets/common/textautogenerateflowlayout.h"
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
using namespace TextAutoGenerateText;
using namespace Qt::Literals::StringLiterals;
TextAutoGenerateTextLineEditAttachmentWidget::TextAutoGenerateTextLineEditAttachmentWidget(QWidget *parent)
: QWidget{parent}
- , mMainLayout(new TextAutoGenerateFlowLayout(this))
+ , mMainLayout(new TextAddonsWidgets::TextAddonsWidgetFlowLayout(this))
{
mMainLayout->setObjectName(u"mainLayout"_s);
mMainLayout->setContentsMargins({});
diff --git a/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.h b/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.h
index cd0fd0e29..8bb529f35 100644
--- a/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.h
+++ b/textautogeneratetext/widgets/common/textautogeneratetextlineeditattachmentwidget.h
@@ -7,6 +7,10 @@
#include "core/textautogenerateattachmentutils.h"
#include "textautogeneratetext_private_export.h"
#include <QWidget>
+namespace TextAddonsWidgets
+{
+class TextAddonsWidgetFlowLayout;
+}
namespace TextAutoGenerateText
{
class TextAutoGenerateTextLineEditAttachmentClickableWidget;
@@ -26,6 +30,6 @@ public:
private:
TEXTAUTOGENERATETEXT_NO_EXPORT void slotRemoveAttachment(const QString &fileName);
QMap<QString, TextAutoGenerateTextLineEditAttachmentClickableWidget *> mMap;
- TextAutoGenerateFlowLayout *const mMainLayout;
+ TextAddonsWidgets::TextAddonsWidgetFlowLayout *const mMainLayout;
};
}
diff --git a/textautogeneratetext/widgets/toolswidget/textautogeneratetoolswidget.cpp b/textautogeneratetext/widgets/toolswidget/textautogeneratetoolswidget.cpp
index ea43aa1d3..4ef58ca5c 100644
--- a/textautogeneratetext/widgets/toolswidget/textautogeneratetoolswidget.cpp
+++ b/textautogeneratetext/widgets/toolswidget/textautogeneratetoolswidget.cpp
@@ -6,10 +6,10 @@
#include "textautogeneratetoolswidget.h"
#include "core/tools/textautogeneratetexttoolpluginmanager.h"
#include "textautogeneratetextwidget_debug.h"
-#include "widgets/common/textautogenerateflowlayout.h"
#include <KLocalizedString>
#include <QLabel>
#include <QToolButton>
+#include <TextAddonsWidgets/TextAddonsWidgetFlowLayout>
using namespace Qt::Literals::StringLiterals;
using namespace TextAutoGenerateText;
@@ -20,7 +20,7 @@ constexpr const char *button_property("identifier");
TextAutoGenerateToolsWidget::TextAutoGenerateToolsWidget(QWidget *parent)
: QWidget{parent}
{
- auto mainLayout = new TextAutoGenerateFlowLayout(this);
+ auto mainLayout = new TextAddonsWidgets::TextAddonsWidgetFlowLayout(this);
mainLayout->setObjectName(u"mainLayout"_s);
mainLayout->setContentsMargins({});