diff --git a/cmake/define_definitions.cmake b/cmake/define_definitions.cmake index 94550bbde..75b65ae38 100644 --- a/cmake/define_definitions.cmake +++ b/cmake/define_definitions.cmake @@ -65,7 +65,7 @@ message("GIT_COMMIT_SHA :" ${GIT_COMMIT_SHA}) if(BUILD_WITH_KF6) message("KF6_GIT_TAG :" ${KF6_GIT_TAG}) else() - add_definitions(-DBUILD_WITHOUT_KF5) + add_definitions(-DBUILD_WITHOUT_KF6) endif() message("QET_COMPONENTS :" ${QET_COMPONENTS}) message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp index b21c2039d..afb841bb9 100644 --- a/sources/editor/ui/dynamictextfieldeditor.cpp +++ b/sources/editor/ui/dynamictextfieldeditor.cpp @@ -140,7 +140,7 @@ void DynamicTextFieldEditor::updateForm() ui -> m_user_text_le -> setText(m_text_field.data() -> text()); ui -> m_size_sb -> setValue(m_text_field.data() -> font().pointSize()); ui->m_keep_visual_rotation_cb->setChecked(m_text_field.data()->keepVisualRotation()); -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else m_color_kpb -> setColor(m_text_field.data() -> color()); #endif @@ -169,7 +169,7 @@ void DynamicTextFieldEditor::updateForm() void DynamicTextFieldEditor::setupWidget() { -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else m_color_kpb = new KColorButton(this); m_color_kpb->setObjectName(QString::fromUtf8("m_color_kpb")); diff --git a/sources/editor/ui/dynamictextfieldeditor.h b/sources/editor/ui/dynamictextfieldeditor.h index d419f9c72..29644c4ae 100644 --- a/sources/editor/ui/dynamictextfieldeditor.h +++ b/sources/editor/ui/dynamictextfieldeditor.h @@ -21,7 +21,7 @@ #include "../elementitemeditor.h" #include "../graphicspart/partdynamictextfield.h" -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else # include #endif @@ -77,7 +77,7 @@ class DynamicTextFieldEditor : public ElementItemEditor { QList m_parts; QList m_connection_list; - #ifdef BUILD_WITHOUT_KF5 + #ifdef BUILD_WITHOUT_KF6 #else KColorButton* m_color_kpb = nullptr; #endif diff --git a/sources/editor/ui/texteditor.cpp b/sources/editor/ui/texteditor.cpp index b088e6571..4dea81414 100644 --- a/sources/editor/ui/texteditor.cpp +++ b/sources/editor/ui/texteditor.cpp @@ -62,7 +62,7 @@ void TextEditor::updateForm() m_rotation_sb -> setValue(m_text -> rotation()); m_size_sb -> setValue(m_text -> font().pointSize()); m_font_pb -> setText(m_text -> font().family()); -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else m_color_pb -> setColor(m_text -> defaultTextColor()); #endif @@ -344,7 +344,7 @@ void TextEditor::setUpWidget(QWidget *parent) m_line_edit->setPlaceholderText(tr("Entrer votre texte ici")); gridLayout->addWidget(m_line_edit, 0, 0, 1, 6); -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else m_color_pb = new KColorButton(parent); m_color_pb->setObjectName(QString::fromUtf8("m_color_pb")); diff --git a/sources/editor/ui/texteditor.h b/sources/editor/ui/texteditor.h index 97d85d4d5..de6bc8b74 100644 --- a/sources/editor/ui/texteditor.h +++ b/sources/editor/ui/texteditor.h @@ -25,7 +25,7 @@ #include #include #include -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else #include #endif @@ -65,7 +65,7 @@ class TextEditor : public ElementItemEditor { QSpinBox *m_size_sb; QLineEdit *m_line_edit; QPushButton *m_font_pb; -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else KColorButton *m_color_pb; #endif diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 8967347ae..727dbdc89 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -45,7 +45,7 @@ #define STRINGIFY(x) #x #include #include -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else # include #endif @@ -2368,7 +2368,7 @@ void QETApp::buildSystemTrayMenu() */ void QETApp::checkBackupFiles() { -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 return; #else QList stale_files = KAutoSaveFile::allStaleFiles(); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index e50b158e4..96ca61871 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -46,7 +46,7 @@ #include "ui/diagrameditorhandlersizewidget.h" #include "TerminalStrip/ui/addterminalstripitemdialog.h" -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else # include #endif @@ -1892,7 +1892,7 @@ bool QETDiagramEditor::drawGrid() const return m_draw_grid->isChecked(); } -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else /** @brief QETDiagramEditor::openBackupFiles diff --git a/sources/qetdiagrameditor.h b/sources/qetdiagrameditor.h index 382605fa6..db528ca31 100644 --- a/sources/qetdiagrameditor.h +++ b/sources/qetdiagrameditor.h @@ -43,7 +43,7 @@ class DiagramPropertiesEditorDockWidget; class ElementsCollectionWidget; class AutoNumberingDockWidget; -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else class KAutoSaveFile; #endif @@ -69,7 +69,7 @@ class QETDiagramEditor : public QETMainWindow ProjectView *currentProjectView() const; QETProject *currentProject() const; bool drawGrid() const; -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else void openBackupFiles (QList backup_files); #endif diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 4d60aba14..63f51acc4 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -86,7 +86,7 @@ QETProject::QETProject(const QString &path, QObject *parent) : init(); } -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else /** @brief QETProject::QETProject @@ -330,7 +330,7 @@ void QETProject::setFilePath(const QString &filepath) if (filepath == m_file_path) { return; } -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else if (m_backup_file.isOpen()) { m_backup_file.close(); @@ -1911,7 +1911,7 @@ NamesList QETProject::namesListForIntegrationCategory() */ void QETProject::writeBackup() { -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else # if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove QDomDocument xml_project(toXml()); diff --git a/sources/qetproject.h b/sources/qetproject.h index 696a28a44..b508a1c9b 100644 --- a/sources/qetproject.h +++ b/sources/qetproject.h @@ -29,7 +29,7 @@ #include "titleblock/templatescollection.h" #include "titleblockproperties.h" -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else # include #endif @@ -47,7 +47,7 @@ class XmlElementCollection; class QTimer; class TerminalStrip; -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else class KAutoSaveFile; #endif @@ -78,7 +78,7 @@ class QETProject : public QObject public: QETProject (QObject *parent = nullptr); QETProject (const QString &path, QObject * = nullptr); -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else QETProject (KAutoSaveFile *backup, QObject *parent=nullptr); #endif @@ -288,7 +288,7 @@ class QETProject : public QObject bool m_freeze_new_conductors = false; QTimer m_save_backup_timer, m_autosave_timer; -#ifdef BUILD_WITHOUT_KF5 +#ifdef BUILD_WITHOUT_KF6 #else KAutoSaveFile m_backup_file; #endif