Skip to content

Convert xqctide from Qt3 to Qt6 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Convert xqctide from Qt3 to Qt6 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3b3567
Initial plan
Copilot Sep 11, 2025
c03e7f5
Update Qt3 includes and classes to Qt6 equivalents
Copilot Sep 11, 2025
4bb61fa
Update Qt3 menu API calls and fix compilation issues
Copilot Sep 11, 2025
06ba435
Complete Qt3 to Qt6 core conversion with compilation test
Copilot Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .qmake.stash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201703L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 13
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
/usr/include/c++/13 \
/usr/include/x86_64-linux-gnu/c++/13 \
/usr/include/c++/13/backward \
/usr/lib/gcc/x86_64-linux-gnu/13/include \
/usr/local/include \
/usr/include/x86_64-linux-gnu \
/usr/include
QMAKE_CXX.LIBDIRS = \
/usr/lib/gcc/x86_64-linux-gnu/13 \
/usr/lib/x86_64-linux-gnu \
/usr/lib \
/lib/x86_64-linux-gnu \
/lib
454 changes: 445 additions & 9 deletions Makefile
View file
Open in desktop

Large diffs are not rendered by default.

327 changes: 126 additions & 201 deletions configdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,202 +1,127 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigWidget</class>
<widget class="QWidget">
<property name="name">
<cstring>Form1</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>419</width>
<height>248</height>
</rect>
</property>
<property name="caption">
<string>Form1</string>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ConfigWidget</class>
<widget class="QWidget" name="ConfigWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>419</width>
<height>248</height>
</rect>
</property>
<property name="windowTitle">
<string>Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox1">
<property name="title">
<string>Tidal Levels</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="tlMustBeOnChart">
<property name="text">
<string>Must be on chart</string>
</property>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
</property>
<property name="title">
<string>Tidal Levels</string>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<property name="name">
<cstring>TLmustBeOnChart</cstring>
</property>
<property name="text">
<string>Tidal Level must refer to the currently-loaded chart</string>
</property>
<property name="toolTip" stdset="0">
<string>It is not sufficient to be visible on the currently loaded chart, the Tidal Level must also explicitly reference the chart by name</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>TLmustBeUnique</cstring>
</property>
<property name="text">
<string>Tidal Level must be unique</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="toolTip" stdset="0">
<string>There must be no other Tidal Levels at its location</string>
</property>
</widget>
</vbox>
</widget>
<spacer>
<property name="name">
<cstring>spacer1</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox2</cstring>
</property>
<property name="title">
<string>Tidal Streams</string>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<property name="name">
<cstring>TSmustBeOnChart</cstring>
</property>
<property name="text">
<string>Tidal Stream must refer to the currently-loaded chart</string>
</property>
<property name="toolTip" stdset="0">
<string>It is not sufficient to be visible on the currently loaded chart, the Tidal Stream must also explicitly reference the chart by name</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>TSmustBeUnique</cstring>
</property>
<property name="text">
<string>Tidal Stream must be unique</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="toolTip" stdset="0">
<string>There must be no other Tidal Streams at its location</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>TSmustHaveKnownRef</cstring>
</property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Tidal Stream must reference a known Tidal Level station (port)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</vbox>
</widget>
<spacer>
<property name="name">
<cstring>spacer2</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>Default zoom</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>Full size</string>
</property>
</item>
<item>
<property name="text">
<string>Half size</string>
</property>
</item>
<item>
<property name="text">
<string>Quarter size</string>
</property>
</item>
<item>
<property name="text">
<string>Eighth size</string>
</property>
</item>
<property name="name">
<cstring>zoomOutLevel</cstring>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
</UI>
</widget>
</item>
<item>
<widget class="QCheckBox" name="tlMustBeUnique">
<property name="text">
<string>Must be unique</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox2">
<property name="title">
<string>Tidal Streams</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="tsMustBeOnChart">
<property name="text">
<string>Must be on chart</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="tsMustBeUnique">
<property name="text">
<string>Must be unique</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="tsMustHaveKnownRef">
<property name="text">
<string>Must have known reference</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox3">
<property name="title">
<string>Zoom</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="zoomLabel">
<property name="text">
<string>Default zoom out level:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="zoomComboBox">
<item>
<property name="text">
<string>Full size</string>
</property>
</item>
<item>
<property name="text">
<string>Half size</string>
</property>
</item>
<item>
<property name="text">
<string>Quarter size</string>
</property>
</item>
<item>
<property name="text">
<string>Eighth size</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Loading