kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 14:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced BUILD_WITHOUT_KF5 to BUILD_WITHOUT_KF6

Browse Source
This commit is contained in:
Magnus Hellströmer
2024-09-08 23:15:38 +02:00
parent 40abc3892c
commit a88d485051
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/define_definitions.cmake
View File

@@ -65,7 +65,7 @@ message("GIT_COMMIT_SHA :" ${GIT_COMMIT_SHA})
if(BUILD_WITH_KF6) if(BUILD_WITH_KF6)
message("KF6_GIT_TAG :" ${KF6_GIT_TAG}) message("KF6_GIT_TAG :" ${KF6_GIT_TAG})
else() else()
add_definitions(-DBUILD_WITHOUT_KF5) add_definitions(-DBUILD_WITHOUT_KF6)
endif() endif()
message("QET_COMPONENTS :" ${QET_COMPONENTS}) message("QET_COMPONENTS :" ${QET_COMPONENTS})
message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR})

4
sources/editor/ui/dynamictextfieldeditor.cpp
View File

@@ -140,7 +140,7 @@ void DynamicTextFieldEditor::updateForm()
ui -> m_user_text_le -> setText(m_text_field.data() -> text()); ui -> m_user_text_le -> setText(m_text_field.data() -> text());
ui -> m_size_sb -> setValue(m_text_field.data() -> font().pointSize()); ui -> m_size_sb -> setValue(m_text_field.data() -> font().pointSize());
ui->m_keep_visual_rotation_cb->setChecked(m_text_field.data()->keepVisualRotation()); ui->m_keep_visual_rotation_cb->setChecked(m_text_field.data()->keepVisualRotation());
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
m_color_kpb -> setColor(m_text_field.data() -> color()); m_color_kpb -> setColor(m_text_field.data() -> color());
#endif #endif
@@ -169,7 +169,7 @@ void DynamicTextFieldEditor::updateForm()
void DynamicTextFieldEditor::setupWidget() void DynamicTextFieldEditor::setupWidget()
{ {
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
m_color_kpb = new KColorButton(this); m_color_kpb = new KColorButton(this);
m_color_kpb->setObjectName(QString::fromUtf8("m_color_kpb")); m_color_kpb->setObjectName(QString::fromUtf8("m_color_kpb"));

4
sources/editor/ui/dynamictextfieldeditor.h
View File

@@ -21,7 +21,7 @@
#include "../elementitemeditor.h" #include "../elementitemeditor.h"
#include "../graphicspart/partdynamictextfield.h" #include "../graphicspart/partdynamictextfield.h"
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
# include <KColorButton> # include <KColorButton>
#endif #endif
@@ -77,7 +77,7 @@ class DynamicTextFieldEditor : public ElementItemEditor {
QList<PartDynamicTextField*> m_parts; QList<PartDynamicTextField*> m_parts;
QList<QMetaObject::Connection> m_connection_list; QList<QMetaObject::Connection> m_connection_list;
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
KColorButton* m_color_kpb = nullptr; KColorButton* m_color_kpb = nullptr;
#endif #endif

4
sources/editor/ui/texteditor.cpp
View File

@@ -62,7 +62,7 @@ void TextEditor::updateForm()
m_rotation_sb -> setValue(m_text -> rotation()); m_rotation_sb -> setValue(m_text -> rotation());
m_size_sb -> setValue(m_text -> font().pointSize()); m_size_sb -> setValue(m_text -> font().pointSize());
m_font_pb -> setText(m_text -> font().family()); m_font_pb -> setText(m_text -> font().family());
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
m_color_pb -> setColor(m_text -> defaultTextColor()); m_color_pb -> setColor(m_text -> defaultTextColor());
#endif #endif
@@ -344,7 +344,7 @@ void TextEditor::setUpWidget(QWidget *parent)
m_line_edit->setPlaceholderText(tr("Entrer votre texte ici")); m_line_edit->setPlaceholderText(tr("Entrer votre texte ici"));
gridLayout->addWidget(m_line_edit, 0, 0, 1, 6); gridLayout->addWidget(m_line_edit, 0, 0, 1, 6);
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
m_color_pb = new KColorButton(parent); m_color_pb = new KColorButton(parent);
m_color_pb->setObjectName(QString::fromUtf8("m_color_pb")); m_color_pb->setObjectName(QString::fromUtf8("m_color_pb"));

4
sources/editor/ui/texteditor.h
View File

@@ -25,7 +25,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
#include <KColorButton> #include <KColorButton>
#endif #endif
@@ -65,7 +65,7 @@ class TextEditor : public ElementItemEditor {
QSpinBox *m_size_sb; QSpinBox *m_size_sb;
QLineEdit *m_line_edit; QLineEdit *m_line_edit;
QPushButton *m_font_pb; QPushButton *m_font_pb;
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
KColorButton *m_color_pb; KColorButton *m_color_pb;
#endif #endif

4
sources/qetapp.cpp
View File

@@ -45,7 +45,7 @@
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QRegularExpression> #include <QRegularExpression>
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
# include <KAutoSaveFile> # include <KAutoSaveFile>
#endif #endif
@@ -2368,7 +2368,7 @@ void QETApp::buildSystemTrayMenu()
*/ */
void QETApp::checkBackupFiles() void QETApp::checkBackupFiles()
{ {
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
return; return;
#else #else
QList<KAutoSaveFile *> stale_files = KAutoSaveFile::allStaleFiles(); QList<KAutoSaveFile *> stale_files = KAutoSaveFile::allStaleFiles();

4
sources/qetdiagrameditor.cpp
View File

@@ -46,7 +46,7 @@
#include "ui/diagrameditorhandlersizewidget.h" #include "ui/diagrameditorhandlersizewidget.h"
#include "TerminalStrip/ui/addterminalstripitemdialog.h" #include "TerminalStrip/ui/addterminalstripitemdialog.h"
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
# include <KAutoSaveFile> # include <KAutoSaveFile>
#endif #endif
@@ -1892,7 +1892,7 @@ bool QETDiagramEditor::drawGrid() const
return m_draw_grid->isChecked(); return m_draw_grid->isChecked();
} }
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
/** /**
@brief QETDiagramEditor::openBackupFiles @brief QETDiagramEditor::openBackupFiles

4
sources/qetdiagrameditor.h
View File

@@ -43,7 +43,7 @@ class DiagramPropertiesEditorDockWidget;
class ElementsCollectionWidget; class ElementsCollectionWidget;
class AutoNumberingDockWidget; class AutoNumberingDockWidget;
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
class KAutoSaveFile; class KAutoSaveFile;
#endif #endif
@@ -69,7 +69,7 @@ class QETDiagramEditor : public QETMainWindow
ProjectView *currentProjectView() const; ProjectView *currentProjectView() const;
QETProject *currentProject() const; QETProject *currentProject() const;
bool drawGrid() const; bool drawGrid() const;
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
void openBackupFiles (QList<KAutoSaveFile *> backup_files); void openBackupFiles (QList<KAutoSaveFile *> backup_files);
#endif #endif

6
sources/qetproject.cpp
View File

@@ -86,7 +86,7 @@ QETProject::QETProject(const QString &path, QObject *parent) :
init(); init();
} }
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
/** /**
@brief QETProject::QETProject @brief QETProject::QETProject
@@ -330,7 +330,7 @@ void QETProject::setFilePath(const QString &filepath)
if (filepath == m_file_path) { if (filepath == m_file_path) {
return; return;
} }
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
if (m_backup_file.isOpen()) { if (m_backup_file.isOpen()) {
m_backup_file.close(); m_backup_file.close();
@@ -1911,7 +1911,7 @@ NamesList QETProject::namesListForIntegrationCategory()
*/ */
void QETProject::writeBackup() void QETProject::writeBackup()
{ {
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove # if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
QDomDocument xml_project(toXml()); QDomDocument xml_project(toXml());

8
sources/qetproject.h
View File

@@ -29,7 +29,7 @@
#include "titleblock/templatescollection.h" #include "titleblock/templatescollection.h"
#include "titleblockproperties.h" #include "titleblockproperties.h"
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
# include <KAutoSaveFile> # include <KAutoSaveFile>
#endif #endif
@@ -47,7 +47,7 @@ class XmlElementCollection;
class QTimer; class QTimer;
class TerminalStrip; class TerminalStrip;
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
class KAutoSaveFile; class KAutoSaveFile;
#endif #endif
@@ -78,7 +78,7 @@ class QETProject : public QObject
public: public:
QETProject (QObject *parent = nullptr); QETProject (QObject *parent = nullptr);
QETProject (const QString &path, QObject * = nullptr); QETProject (const QString &path, QObject * = nullptr);
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
QETProject (KAutoSaveFile *backup, QObject *parent=nullptr); QETProject (KAutoSaveFile *backup, QObject *parent=nullptr);
#endif #endif
@@ -288,7 +288,7 @@ class QETProject : public QObject
bool m_freeze_new_conductors = false; bool m_freeze_new_conductors = false;
QTimer m_save_backup_timer, QTimer m_save_backup_timer,
m_autosave_timer; m_autosave_timer;
#ifdef BUILD_WITHOUT_KF5 #ifdef BUILD_WITHOUT_KF6
#else #else
KAutoSaveFile m_backup_file; KAutoSaveFile m_backup_file;
#endif #endif