Skip to content

Commit c135782

Browse files
githubuser0xFFFFgithubuser0xFFFF
committed
Updated examples and demo to use createDockWidget() function for dock manager instead of deprecated DockWidgetr constructor
1 parent 79c208d commit c135782

File tree

10 files changed

+27
-30
lines changed

10 files changed

+27
-30
lines changed

‎examples/autohide/mainwindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CMainWindow::CMainWindow(QWidget *parent)
3333
// Set central widget
3434
QPlainTextEdit* w = new QPlainTextEdit();
3535
w->setPlaceholderText("This is the central editor. Enter your text here.");
36-
CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
36+
CDockWidget* CentralDockWidget = DockManager->createDockWidget("CentralWidget");
3737
CentralDockWidget->setWidget(w);
3838
auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
3939
CentralDockArea->setAllowedAreas(DockWidgetArea::OuterDockAreas);
@@ -42,7 +42,7 @@ CMainWindow::CMainWindow(QWidget *parent)
4242
QTableWidget* table = new QTableWidget();
4343
table->setColumnCount(3);
4444
table->setRowCount(10);
45-
CDockWidget* TableDockWidget = new CDockWidget("Table 1");
45+
CDockWidget* TableDockWidget = DockManager->createDockWidget("Table 1");
4646
TableDockWidget->setWidget(table);
4747
TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
4848
TableDockWidget->setMinimumSize(200,150);
@@ -53,7 +53,7 @@ CMainWindow::CMainWindow(QWidget *parent)
5353
table = new QTableWidget();
5454
table->setColumnCount(5);
5555
table->setRowCount(1020);
56-
TableDockWidget = new CDockWidget("Table 2");
56+
TableDockWidget = DockManager->createDockWidget("Table 2");
5757
TableDockWidget->setWidget(table);
5858
TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
5959
TableDockWidget->resize(250, 150);
@@ -64,7 +64,7 @@ CMainWindow::CMainWindow(QWidget *parent)
6464
QTableWidget* propertiesTable = new QTableWidget();
6565
propertiesTable->setColumnCount(3);
6666
propertiesTable->setRowCount(10);
67-
CDockWidget* PropertiesDockWidget = new CDockWidget("Properties");
67+
CDockWidget* PropertiesDockWidget = DockManager->createDockWidget("Properties");
6868
PropertiesDockWidget->setWidget(propertiesTable);
6969
PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
7070
PropertiesDockWidget->resize(250, 150);

‎examples/autohidedragndrop/mainwindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ CMainWindow::CMainWindow(QWidget *parent)
3535
// Set central widget
3636
QPlainTextEdit* w = new QPlainTextEdit();
3737
w->setPlaceholderText("This is the central editor. Enter your text here.");
38-
CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
38+
CDockWidget* CentralDockWidget = DockManager->createDockWidget("CentralWidget");
3939
CentralDockWidget->setWidget(w);
4040
auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
4141
CentralDockArea->setAllowedAreas(DockWidgetArea::OuterDockAreas);
4242

4343
{
4444
DroppableItem* droppableItem = new DroppableItem("Drop text here.");
45-
CDockWidget* dropDockWidget = new CDockWidget("Tab 1");
45+
CDockWidget* dropDockWidget = DockManager->createDockWidget("Tab 1");
4646
dropDockWidget->setWidget(droppableItem);
4747
dropDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
4848
dropDockWidget->setMinimumSize(200,150);
@@ -54,7 +54,7 @@ CMainWindow::CMainWindow(QWidget *parent)
5454
}
5555
{
5656
DroppableItem* droppableItem = new DroppableItem("Drop text here.");
57-
CDockWidget* dropDockWidget = new CDockWidget("Tab 2");
57+
CDockWidget* dropDockWidget = DockManager->createDockWidget("Tab 2");
5858
dropDockWidget->setWidget(droppableItem);
5959
dropDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
6060
dropDockWidget->setMinimumSize(200,150);
@@ -68,7 +68,7 @@ CMainWindow::CMainWindow(QWidget *parent)
6868
QTableWidget* propertiesTable = new QTableWidget();
6969
propertiesTable->setColumnCount(3);
7070
propertiesTable->setRowCount(10);
71-
CDockWidget* PropertiesDockWidget = new CDockWidget("Properties");
71+
CDockWidget* PropertiesDockWidget = DockManager->createDockWidget("Properties");
7272
PropertiesDockWidget->setWidget(propertiesTable);
7373
PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
7474
PropertiesDockWidget->resize(250, 150);

‎examples/centralwidget/mainwindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ CMainWindow::CMainWindow(QWidget *parent)
4040
// Set central widget
4141
QPlainTextEdit* w = new QPlainTextEdit();
4242
w->setPlaceholderText("This is the central editor. Enter your text here.");
43-
CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
43+
CDockWidget* CentralDockWidget = DockManager->createDockWidget("CentralWidget");
4444
CentralDockWidget->setWidget(w);
4545
auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
4646
CentralDockArea->setAllowedAreas(DockWidgetArea::OuterDockAreas);
@@ -49,7 +49,7 @@ CMainWindow::CMainWindow(QWidget *parent)
4949
QTableWidget* table = new QTableWidget();
5050
table->setColumnCount(3);
5151
table->setRowCount(10);
52-
CDockWidget* TableDockWidget = new CDockWidget("Table 1");
52+
CDockWidget* TableDockWidget = DockManager->createDockWidget("Table 1");
5353
TableDockWidget->setWidget(table);
5454
TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
5555
TableDockWidget->resize(250, 150);
@@ -60,7 +60,7 @@ CMainWindow::CMainWindow(QWidget *parent)
6060
table = new QTableWidget();
6161
table->setColumnCount(5);
6262
table->setRowCount(1020);
63-
TableDockWidget = new CDockWidget("Table 2");
63+
TableDockWidget = DockManager->createDockWidget("Table 2");
6464
TableDockWidget->setWidget(table);
6565
TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
6666
TableDockWidget->resize(250, 150);
@@ -71,7 +71,7 @@ CMainWindow::CMainWindow(QWidget *parent)
7171
QTableWidget* propertiesTable = new QTableWidget();
7272
propertiesTable->setColumnCount(3);
7373
propertiesTable->setRowCount(10);
74-
CDockWidget* PropertiesDockWidget = new CDockWidget("Properties");
74+
CDockWidget* PropertiesDockWidget = DockManager->createDockWidget("Properties");
7575
PropertiesDockWidget->setWidget(propertiesTable);
7676
PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
7777
PropertiesDockWidget->resize(250, 150);

‎examples/configflags/mainwindow.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <QToolBar>
77

88
#include "DockAreaWidget.h"
9-
#include "DockAreaTitleBar.h"
109

1110

1211
using namespace ads;
@@ -36,15 +35,15 @@ CMainWindow::CMainWindow(QWidget *parent) :
3635
l1->setWordWrap(true);
3736
l1->setAlignment(Qt::AlignTop | Qt::AlignLeft);
3837
l1->setText("Docking widget 1");
39-
ads::CDockWidget *dockWidget1 = new ads::CDockWidget("Dock 1");
38+
ads::CDockWidget *dockWidget1 = DockManager->createDockWidget("Dock 1");
4039
dockWidget1->setWidget(l1);
4140
DockManager->addDockWidget(ads::LeftDockWidgetArea, dockWidget1);
4241

4342
QLabel *l2 = new QLabel();
4443
l2->setWordWrap(true);
4544
l2->setAlignment(Qt::AlignTop | Qt::AlignLeft);
4645
l2->setText("Docking widget 2");
47-
ads::CDockWidget *dockWidget2 = new ads::CDockWidget("Dock 2");
46+
ads::CDockWidget *dockWidget2 = DockManager->createDockWidget("Dock 2");
4847
dockWidget2->setWidget(l2);
4948
DockManager->addDockWidget(ads::RightDockWidgetArea, dockWidget2);
5049

‎examples/deleteonclose/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ int main(int argc, char *argv[])
4646

4747
int i = 0;
4848
QObject::connect(action, &QAction::triggered, [&]() {
49-
auto dw = new ads::CDockWidget(QStringLiteral("test %1 [DockWidgetDeleteOnClose]").arg(i++), &w);
49+
auto dw = dockManager->createDockWidget(QStringLiteral("test %1 [DockWidgetDeleteOnClose]").arg(i++), &w);
5050
auto editor = new QTextEdit(QStringLiteral("lorem ipsum..."), dw);
5151
dw->setWidget(editor);
5252
dw->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
5353
auto area = dockManager->addDockWidgetTab(ads::CenterDockWidgetArea, dw);
5454
qDebug() << "doc dock widget created!" << dw << area;
5555
});
5656

57-
auto dw = new ads::CDockWidget(QStringLiteral("test %1 [DeleteContentOnClose]").arg(i++), &w);
57+
auto dw = dockManager->createDockWidget(QStringLiteral("test %1 [DeleteContentOnClose]").arg(i++), &w);
5858
auto editor = new QTextEdit(QStringLiteral("recreated lorem ipsum......"), dw);
5959
dw->setWidget(editor);
6060
dw->setFeature(ads::CDockWidget::DeleteContentOnClose, true);
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
7777
action = new QAction("New", &w);
7878
w.menuBar()->addAction(action);
7979
QObject::connect(action, &QAction::triggered, [&]() {
80-
auto dw = new ads::CDockWidget(QStringLiteral("test %1").arg(i++), &w);
80+
auto dw = dockManager->createDockWidget(QStringLiteral("test %1").arg(i++), &w);
8181
auto editor = new QTextEdit(QStringLiteral("lorem ipsum..."), dw);
8282
dw->setWidget(editor);
8383
auto area = dockManager->addDockWidgetTab(ads::CenterDockWidgetArea, dw);

‎examples/dockindock/dockindock.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ads::CDockAreaWidget* DockInDockWidget::addTabWidget( QWidget* widget, const QSt
5454
}
5555
}
5656

57-
ads::CDockWidget* DockWidget = new ads::CDockWidget(name);
57+
ads::CDockWidget* DockWidget = m_mgr->createDockWidget(name);
5858
DockWidget->setWidget(widget);
5959
DockWidget->setIcon( icon );
6060

@@ -101,7 +101,7 @@ DockInDockWidget* DockInDockWidget::createGroup( const QString& groupName, QIcon
101101
DockInDockWidget* child = new DockInDockWidget( this, m_topLevelDockWidget, m_perspectivesManager );
102102
child->setObjectName( groupName );
103103

104-
ads::CDockWidget* DockWidget = new ads::CDockWidget(groupName);
104+
ads::CDockWidget* DockWidget = m_mgr->createDockWidget(groupName);
105105
DockWidget->setWidget(child);
106106
DockWidget->setIcon(icon);
107107

‎examples/emptydockarea/mainwindow.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include <QToolBar>
2020

2121
#include "DockAreaWidget.h"
22-
#include "DockAreaTitleBar.h"
23-
#include "DockAreaTabBar.h"
2422
#include "FloatingDockContainer.h"
2523
#include "DockComponentsFactory.h"
2624

@@ -44,7 +42,7 @@ CMainWindow::CMainWindow(QWidget *parent)
4442
QLabel* label = new QLabel();
4543
label->setText("This is a DockArea which is always visible, even if it does not contain any DockWidgets.");
4644
label->setAlignment(Qt::AlignCenter);
47-
CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
45+
CDockWidget* CentralDockWidget = DockManager->createDockWidget("CentralWidget");
4846
CentralDockWidget->setWidget(label);
4947
CentralDockWidget->setFeature(ads::CDockWidget::NoTab, true);
5048
auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
@@ -53,7 +51,7 @@ CMainWindow::CMainWindow(QWidget *parent)
5351
QTableWidget* table = new QTableWidget();
5452
table->setColumnCount(3);
5553
table->setRowCount(10);
56-
CDockWidget* TableDockWidget = new CDockWidget("Table 1");
54+
CDockWidget* TableDockWidget = DockManager->createDockWidget("Table 1");
5755
TableDockWidget->setWidget(table);
5856
TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
5957
TableDockWidget->resize(250, 150);
@@ -65,7 +63,7 @@ CMainWindow::CMainWindow(QWidget *parent)
6563
table = new QTableWidget();
6664
table->setColumnCount(5);
6765
table->setRowCount(1020);
68-
TableDockWidget = new CDockWidget("Table 2");
66+
TableDockWidget = DockManager->createDockWidget("Table 2");
6967
TableDockWidget->setWidget(table);
7068
TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
7169
TableDockWidget->resize(250, 150);
@@ -76,7 +74,7 @@ CMainWindow::CMainWindow(QWidget *parent)
7674
QTableWidget* propertiesTable = new QTableWidget();
7775
propertiesTable->setColumnCount(3);
7876
propertiesTable->setRowCount(10);
79-
CDockWidget* PropertiesDockWidget = new CDockWidget("Properties");
77+
CDockWidget* PropertiesDockWidget = DockManager->createDockWidget("Properties");
8078
PropertiesDockWidget->setWidget(propertiesTable);
8179
PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
8280
PropertiesDockWidget->resize(250, 150);

‎examples/hideshow/MainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ MainWindow::MainWindow(QWidget *parent) :
3535

3636
// Create a dock widget with the title Label 1 and set the created label
3737
// as the dock widget content
38-
ads::CDockWidget* DockWidget = new ads::CDockWidget("Label 1");
38+
ads::CDockWidget* DockWidget = m_DockManager->createDockWidget("Label 1");
3939
DockWidget->setWidget(l);
4040

4141
// Add the toggleViewAction of the dock widget to the menu to give

‎examples/sidebar/MainWindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MainWindow::MainWindow(QWidget *parent) :
2828

2929
// Create a dock widget with the title Label 1 and set the created label
3030
// as the dock widget content
31-
ads::CDockWidget* DockWidget = new ads::CDockWidget("Label 1");
31+
ads::CDockWidget* DockWidget = m_DockManager->createDockWidget("Label 1");
3232
DockWidget->setWidget(l);
3333

3434
// Add the toggleViewAction of the dock widget to the menu to give
@@ -42,7 +42,7 @@ MainWindow::MainWindow(QWidget *parent) :
4242
// Create an example editor
4343
QPlainTextEdit* te = new QPlainTextEdit();
4444
te->setPlaceholderText("Please enter your text here into this QPlainTextEdit...");
45-
DockWidget = new ads::CDockWidget("Editor 1");
45+
DockWidget = m_DockManager->createDockWidget("Editor 1");
4646
DockWidget->setWidget(te);
4747
ui->menuView->addAction(DockWidget->toggleViewAction());
4848
m_DockManager->addDockWidget(ads::BottomDockWidgetArea, DockWidget);

‎examples/simple/MainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent) :
2424

2525
// Create a dock widget with the title Label 1 and set the created label
2626
// as the dock widget content
27-
ads::CDockWidget* DockWidget = new ads::CDockWidget("Label 1");
27+
ads::CDockWidget* DockWidget = m_DockManager->createDockWidget("Label 1");
2828
DockWidget->setWidget(l);
2929

3030
// Add the toggleViewAction of the dock widget to the menu to give

0 commit comments

Comments
 (0)