From c3af2de74e016224db0b58d6b2d90d39d0d7299a Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 29 Jan 2025 17:18:05 +0100 Subject: [PATCH] clean up --- playground/systemdialogs/main.cpp | 7 +++---- src/dialogs/QskColorPicker.h | 4 ++-- src/dialogs/QskColorPickerSkinlet.cpp | 4 ---- src/dialogs/QskColorPickerSkinlet.h | 4 +--- src/dialogs/QskDialog.cpp | 12 ------------ src/dialogs/QskDialog.h | 2 +- src/dialogs/QskFontSelectionWindow.cpp | 4 ++-- src/dialogs/QskFontSelectionWindow.h | 2 +- src/dialogs/QskWindowOrSubWindow.cpp | 1 + 9 files changed, 11 insertions(+), 29 deletions(-) diff --git a/playground/systemdialogs/main.cpp b/playground/systemdialogs/main.cpp index 77aa73c0..91533586 100644 --- a/playground/systemdialogs/main.cpp +++ b/playground/systemdialogs/main.cpp @@ -90,12 +90,12 @@ namespace } case FileDialog: { - auto file = qskDialog->selectFile( "select file", QDir::currentPath() ); + qskDialog->selectFile( "select file", QDir::currentPath() ); break; } case FolderDialog: { - auto file = qskDialog->selectDirectory( "select directory", QDir::currentPath() ); + qskDialog->selectDirectory( "select directory", QDir::currentPath() ); break; } case FontDialog: @@ -105,8 +105,7 @@ namespace } case MessageDialog: { - auto action = qskDialog->message( "message", "The quick brown fox jumps over the lazy dog" ); - qDebug() << "got message action" << action; + qskDialog->message( "message", "The quick brown fox jumps over the lazy dog" ); break; } default: diff --git a/src/dialogs/QskColorPicker.h b/src/dialogs/QskColorPicker.h index 57fa84eb..f5077ab4 100644 --- a/src/dialogs/QskColorPicker.h +++ b/src/dialogs/QskColorPicker.h @@ -37,8 +37,8 @@ class QskColorPicker : public QskBoundedControl Q_SIGNALS: void valueChanged( qreal ); - void selectedColorChanged() const; - void positionChanged() const; + void selectedColorChanged(); + void positionChanged(); protected: void updateLayout() override; diff --git a/src/dialogs/QskColorPickerSkinlet.cpp b/src/dialogs/QskColorPickerSkinlet.cpp index 6d7096bb..fe10e556 100644 --- a/src/dialogs/QskColorPickerSkinlet.cpp +++ b/src/dialogs/QskColorPickerSkinlet.cpp @@ -18,10 +18,6 @@ namespace class ColorPaneNode : public QskPaintedNode { public: - ColorPaneNode() - { - } - void paint( QPainter* p, const QSize& size, const void* nodeData ) override { const Q* q = static_cast< const Q* >( nodeData ); diff --git a/src/dialogs/QskColorPickerSkinlet.h b/src/dialogs/QskColorPickerSkinlet.h index 5e552ac7..8986d3f3 100644 --- a/src/dialogs/QskColorPickerSkinlet.h +++ b/src/dialogs/QskColorPickerSkinlet.h @@ -32,15 +32,13 @@ class QskColorPickerSkinlet : public QskSkinlet QRectF subControlRect( const QskSkinnable*, const QRectF&, QskAspect::Subcontrol ) const override; - QColor selectedColor() const; - protected: QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; + private: QSGNode* updateColorPaneNode( const QskColorPicker*, QSGNode* ) const; - private: QRectF cursorRect( const QskSkinnable*, const QRectF&, int index ) const; }; diff --git a/src/dialogs/QskDialog.cpp b/src/dialogs/QskDialog.cpp index f0406d73..3c6b2d3a 100644 --- a/src/dialogs/QskDialog.cpp +++ b/src/dialogs/QskDialog.cpp @@ -12,22 +12,15 @@ #include "QskSelectionSubWindow.h" #include "QskSelectionWindow.h" -#include "QskBoxBorderColors.h" -#include "QskBoxBorderMetrics.h" #include "QskColorSelectionWindow.h" #include "QskFileSelectionWindow.h" #include "QskFontSelectionWindow.h" -#include "QskEvent.h" -#include "QskFunctions.h" #include "QskFocusIndicator.h" -#include -#include #include #include #include -#include #include @@ -65,10 +58,6 @@ static QskDialog::DialogCode qskExec( QskDialogWindow* dialogWindow ) return dialogWindow->exec(); } -namespace -{ -} - static QQuickWindow* qskSomeQuickWindow() { // not the best code ever, but as it is a fallback only @@ -123,7 +112,6 @@ static void qskSetupWindow( window->setModality( transientParent ? Qt::WindowModal : Qt::ApplicationModal ); const QSize size = window->sizeConstraint(); - qDebug() << "sc:" << size; if ( window->parent() ) { diff --git a/src/dialogs/QskDialog.h b/src/dialogs/QskDialog.h index d2cf6906..803fa20d 100644 --- a/src/dialogs/QskDialog.h +++ b/src/dialogs/QskDialog.h @@ -8,7 +8,7 @@ #include "QskGlobal.h" -#include +#include #include #include diff --git a/src/dialogs/QskFontSelectionWindow.cpp b/src/dialogs/QskFontSelectionWindow.cpp index 55ade2e5..35e84463 100644 --- a/src/dialogs/QskFontSelectionWindow.cpp +++ b/src/dialogs/QskFontSelectionWindow.cpp @@ -40,7 +40,7 @@ QskFontSelectionWindow< W >::QskFontSelectionWindow( QObject* parent, const QStr #endif setupControls( outerBox ); - loadFontInfo(); + connectSignals(); Inherited::setContentItem( outerBox ); } @@ -101,7 +101,7 @@ void QskFontSelectionWindow< W >::setupControls( QQuickItem* parentItem ) } template< typename W > -void QskFontSelectionWindow< W >::loadFontInfo() +void QskFontSelectionWindow< W >::connectSignals() { const auto families = QFontDatabase::families(); m_data->familyView->setEntries( families ); diff --git a/src/dialogs/QskFontSelectionWindow.h b/src/dialogs/QskFontSelectionWindow.h index f35ac1b5..e50c0d1b 100644 --- a/src/dialogs/QskFontSelectionWindow.h +++ b/src/dialogs/QskFontSelectionWindow.h @@ -23,7 +23,7 @@ class QskFontSelectionWindow : public QskWindowOrSubWindow< W > private: void setupControls( QQuickItem* ); - void loadFontInfo(); + void connectSignals(); class PrivateData; std::unique_ptr< PrivateData > m_data; diff --git a/src/dialogs/QskWindowOrSubWindow.cpp b/src/dialogs/QskWindowOrSubWindow.cpp index 7c243d9b..be6c4191 100644 --- a/src/dialogs/QskWindowOrSubWindow.cpp +++ b/src/dialogs/QskWindowOrSubWindow.cpp @@ -8,6 +8,7 @@ #include "QskDialogButtonBox.h" #include "QskFocusIndicator.h" +// copied from QskDialog.cpp: static QskDialog::Action qskActionCandidate( const QskDialogButtonBox* buttonBox ) { // not the fastest code ever, but usually we always