Merge pull request #295 from Krakonos/fix-unity-build

Separated makeBoundaryIcon to its own file to fix UNITY build.
openstreetmap · Mar 14, 2024 · dda2d64 · dda2d64
2 parents 56d2358 + 819cc7c
commit dda2d64
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -286,6 +286,8 @@ src/Utils/PixmapWidget.cpp
 src/Utils/TagSelector.cpp
 src/Utils/SvgCache.h
 src/Utils/RemoteControlServer.cpp
+src/Utils/BoundaryIcon.cpp
+src/Utils/BoundaryIcon.h
 src/QToolBarDialog/qttoolbardialog.h
 src/QToolBarDialog/qttoolbardialog.cpp
 src/QToolBarDialog/qttoolbardialog.ui

diff --git a/cmake/AppImageBuilder.yml.in b/cmake/AppImageBuilder.yml.in
@@ -50,3 +50,4 @@ AppImage:
   update-information: None
   sign-key: None
   arch: x86_64
+  comp: xz
diff --git a/src/PaintStyle/PaintStyleEditor.cpp b/src/PaintStyle/PaintStyleEditor.cpp
@@ -4,6 +4,7 @@
 #include "Painter.h"
 #include "MainWindow.h"
 #include "Document.h"
+#include "BoundaryIcon.h"
 
 #include "SelectionDialog.h"
 
@@ -16,17 +17,6 @@
 #include <QPixmap>
 #include <QToolButton>
 
-static void makeBoundaryIcon(QToolButton* bt, QColor C)
-{
-    QPixmap pm(36, 18);
-    pm.fill(QColor(255, 255, 255));
-    QPainter p(&pm);
-    p.setPen(C);
-    p.setBrush(C);
-    p.drawRect(0, 6, 36, 6);
-    bt->setIcon(pm);
-}
-
 PaintStyleEditor::PaintStyleEditor(QWidget *aParent, const GlobalPainter& aGlobalPainter, const QList<Painter>& aPainters)
     : QDialog(aParent), theGlobalPainter(aGlobalPainter), thePainters(aPainters), FreezeUpdate(true)
 {

diff --git a/src/Preferences/PreferencesDialog.cpp b/src/Preferences/PreferencesDialog.cpp
@@ -16,6 +16,7 @@
 #include "Document.h"
 #include "Feature.h"
 #include "PropertiesDock.h"
+#include "BoundaryIcon.h"
 
 #include <QFileDialog>
 #include <QColorDialog>
@@ -24,18 +25,6 @@
 #include <QStyleFactory>
 #include <QNetworkProxy>
 
-
-static void makeBoundaryIcon(QToolButton* bt, QColor C)
-{
-    QPixmap pm(36, 18);
-    pm.fill(QColor(255, 255, 255));
-    QPainter p(&pm);
-    p.setPen(C);
-    p.setBrush(C);
-    p.drawRect(0, 6, 36, 6);
-    bt->setIcon(pm);
-}
-
 OsmServerWidget::OsmServerWidget(QWidget * parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {

diff --git a/src/Utils/BoundaryIcon.cpp b/src/Utils/BoundaryIcon.cpp
@@ -0,0 +1,19 @@
+#ifndef BOUNDARYICON_H
+#define BOUNDARYICON_H
+
+#include "BoundaryIcon.h"
+
+#include <QPainter>
+
+void makeBoundaryIcon(QToolButton* bt, QColor C)
+{
+    QPixmap pm(36, 18);
+    pm.fill(QColor(255, 255, 255));
+    QPainter p(&pm);
+    p.setPen(C);
+    p.setBrush(C);
+    p.drawRect(0, 6, 36, 6);
+    bt->setIcon(pm);
+}
+
+#endif // BOUNDARYICON_H
diff --git a/src/Utils/BoundaryIcon.h b/src/Utils/BoundaryIcon.h
@@ -0,0 +1,9 @@
+#ifndef __BOUNDARYICON_H__
+#define __BOUNDARYICON_H__
+
+#include <QToolButton>
+#include <QColor>
+
+void makeBoundaryIcon(QToolButton* bt, QColor C);
+
+#endif