[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdevelop/5.3] kdevplatform/sublime: Sublime: mark class members const which should stay const the w
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-09-11 19:19:00
Message-ID: E1fzoBg-0008VD-1K () code ! kde ! org
[Download RAW message or body]
Git commit 6c14205d425880ad5b043329bd8d9994479ed649 by Friedrich W. H. Kossebau.
Committed on 11/09/2018 at 19:16.
Pushed by kossebau into branch '5.3'.
Sublime: mark class members const which should stay const the whole lifetime
M +1 -1 kdevplatform/sublime/container.cpp
M +2 -2 kdevplatform/sublime/controller.cpp
M +9 -7 kdevplatform/sublime/document.cpp
M +1 -1 kdevplatform/sublime/holdupdates.h
M +1 -1 kdevplatform/sublime/idealcontroller.h
M +1 -1 kdevplatform/sublime/idealdockwidget.h
M +1 -1 kdevplatform/sublime/ideallayout.h
M +1 -1 kdevplatform/sublime/idealtoolbutton.h
M +1 -1 kdevplatform/sublime/mainwindow_p.cpp
M +5 -5 kdevplatform/sublime/mainwindow_p.h
M +11 -8 kdevplatform/sublime/view.cpp
https://commits.kde.org/kdevelop/6c14205d425880ad5b043329bd8d9994479ed649
diff --git a/kdevplatform/sublime/container.cpp b/kdevplatform/sublime/container.cpp
index 3eb3778d01..815034d6ae 100644
--- a/kdevplatform/sublime/container.cpp
+++ b/kdevplatform/sublime/container.cpp
@@ -128,7 +128,7 @@ Q_SIGNALS:
void newTabRequested();
private:
- Container* m_container;
+ Container* const m_container;
};
bool sortViews(const View* const lhs, const View* const rhs)
diff --git a/kdevplatform/sublime/controller.cpp \
b/kdevplatform/sublime/controller.cpp index 6c2dc42ca0..923f306cc6 100644
--- a/kdevplatform/sublime/controller.cpp
+++ b/kdevplatform/sublime/controller.cpp
@@ -49,7 +49,7 @@ struct WidgetFinder {
return Area::ContinueWalker;
}
- QWidget *w;
+ QWidget* const w;
View *view;
};
@@ -65,7 +65,7 @@ struct ToolWidgetFinder {
return Area::ContinueWalker;
}
- QWidget *w;
+ QWidget* const w;
View *view;
};
diff --git a/kdevplatform/sublime/document.cpp b/kdevplatform/sublime/document.cpp
index a43f85c4cd..33821ed0ec 100644
--- a/kdevplatform/sublime/document.cpp
+++ b/kdevplatform/sublime/document.cpp
@@ -29,7 +29,10 @@ namespace Sublime {
class DocumentPrivate
{
public:
- explicit DocumentPrivate(Document *doc): m_document(doc) {}
+ DocumentPrivate(Controller* controller, Document* doc)
+ : controller(controller)
+ , document(doc)
+ {}
void removeView(Sublime::View* view)
{
@@ -37,17 +40,17 @@ public:
//no need to keep empty document - we need to remove it
if (views.count() == 0)
{
- emit m_document->aboutToDelete(m_document);
- m_document->deleteLater();
+ emit document->aboutToDelete(document);
+ document->deleteLater();
}
}
- Controller *controller;
QList<View*> views;
QIcon statusIcon;
QString documentToolTip;
- Document *m_document;
+ Controller* const controller;
+ Document* const document;
};
@@ -55,10 +58,9 @@ public:
//class Document
Document::Document(const QString &title, Controller *controller)
- :QObject(controller), d( new DocumentPrivate(this) )
+ :QObject(controller), d( new DocumentPrivate(controller, this) )
{
setObjectName(title);
- d->controller = controller;
d->controller->addDocument(this);
// Functor will be called after destructor has run -> capture controller pointer \
by value
// otherwise we crash because we access the already freed pointer this->d
diff --git a/kdevplatform/sublime/holdupdates.h b/kdevplatform/sublime/holdupdates.h
index 93094735e2..d1ec96f178 100644
--- a/kdevplatform/sublime/holdupdates.h
+++ b/kdevplatform/sublime/holdupdates.h
@@ -64,7 +64,7 @@ class KDEVPLATFORMSUBLIME_EXPORT HoldUpdates {
private:
bool m_wasupdating;
bool m_done;
- QWidget* m_w;
+ QWidget* const m_w;
};
}
diff --git a/kdevplatform/sublime/idealcontroller.h \
b/kdevplatform/sublime/idealcontroller.h index 6328add25b..c99b533cb9 100644
--- a/kdevplatform/sublime/idealcontroller.h
+++ b/kdevplatform/sublime/idealcontroller.h
@@ -101,7 +101,7 @@ private:
void showDock(Qt::DockWidgetArea area, bool show);
void toggleDocksShown(IdealButtonBarWidget *bar, bool show);
- Sublime::MainWindow *m_mainWindow;
+ Sublime::MainWindow* const m_mainWindow;
QSet<IdealDockWidget*> docks;
diff --git a/kdevplatform/sublime/idealdockwidget.h \
b/kdevplatform/sublime/idealdockwidget.h index 5842080b04..2e44f54089 100644
--- a/kdevplatform/sublime/idealdockwidget.h
+++ b/kdevplatform/sublime/idealdockwidget.h
@@ -59,7 +59,7 @@ private:
Area *m_area;
View *m_view;
Qt::DockWidgetArea m_docking_area;
- IdealController *m_controller;
+ IdealController* const m_controller;
};
}
diff --git a/kdevplatform/sublime/ideallayout.h b/kdevplatform/sublime/ideallayout.h
index 16e156cc04..faf2fac077 100644
--- a/kdevplatform/sublime/ideallayout.h
+++ b/kdevplatform/sublime/ideallayout.h
@@ -68,7 +68,7 @@ protected:
private:
QList<QLayoutItem *> _items;
- Qt::Orientation _orientation;
+ const Qt::Orientation _orientation;
int _height;
mutable bool m_minSizeDirty : 1;
mutable bool m_sizeHintDirty : 1;
diff --git a/kdevplatform/sublime/idealtoolbutton.h \
b/kdevplatform/sublime/idealtoolbutton.h index 619a7088e4..3497e39018 100644
--- a/kdevplatform/sublime/idealtoolbutton.h
+++ b/kdevplatform/sublime/idealtoolbutton.h
@@ -40,7 +40,7 @@ protected:
void paintEvent(QPaintEvent *event) override;
private:
- Qt::DockWidgetArea _area;
+ const Qt::DockWidgetArea _area;
};
#endif // IDEALTOOLBUTTON_H
diff --git a/kdevplatform/sublime/mainwindow_p.cpp \
b/kdevplatform/sublime/mainwindow_p.cpp index 89d3534626..85ecc9632e 100644
--- a/kdevplatform/sublime/mainwindow_p.cpp
+++ b/kdevplatform/sublime/mainwindow_p.cpp
@@ -71,7 +71,7 @@ class IdealToolBar : public QToolBar
}
private:
- Sublime::IdealButtonBarWidget* m_buttons;
+ Sublime::IdealButtonBarWidget* const m_buttons;
const bool m_hideWhenEmpty;
};
diff --git a/kdevplatform/sublime/mainwindow_p.h \
b/kdevplatform/sublime/mainwindow_p.h index 3b662ddf09..df63d30875 100644
--- a/kdevplatform/sublime/mainwindow_p.h
+++ b/kdevplatform/sublime/mainwindow_p.h
@@ -55,7 +55,7 @@ public:
explicit IdealToolViewCreator(MainWindowPrivate *_d): d(_d) {}
Area::WalkerMode operator() (View *view, Sublime::Position position);
private:
- MainWindowPrivate *d;
+ MainWindowPrivate* const d;
};
/**Use this to create views for an area.*/
@@ -64,8 +64,8 @@ public:
explicit ViewCreator(MainWindowPrivate *_d, const QList<View*>& _topViews = \
QList<View*>()): d(_d), topViews(_topViews.toSet()) {} Area::WalkerMode operator() \
(AreaIndex *index); private:
- MainWindowPrivate *d;
- QSet<View*> topViews;
+ MainWindowPrivate* const d;
+ const QSet<View*> topViews;
};
/**Reconstructs the mainwindow according to the current area.*/
@@ -80,7 +80,7 @@ public:
void activateFirstVisibleView();
- Controller *controller;
+ Controller* const controller;
Area *area;
QList<View*> docks;
QMap<View*, Container*> viewContainers;
@@ -133,7 +133,7 @@ private:
Qt::DockWidgetArea positionToDockArea(Position position);
void cleanCentralWidget();
- MainWindow *m_mainWindow;
+ MainWindow* const m_mainWindow;
// uses QPointer to make already-deleted splitters detectable
QMap<AreaIndex*, QPointer<QSplitter> > m_indexSplitters;
diff --git a/kdevplatform/sublime/view.cpp b/kdevplatform/sublime/view.cpp
index 9f3486bfe3..9b84de59d2 100644
--- a/kdevplatform/sublime/view.cpp
+++ b/kdevplatform/sublime/view.cpp
@@ -31,14 +31,18 @@ class Document;
class ViewPrivate
{
public:
- ViewPrivate();
- Document *doc = nullptr;
- QWidget *widget = nullptr;
+ ViewPrivate(Document* doc, View::WidgetOwnership ws);
+
void unsetWidget();
- View::WidgetOwnership ws;
+
+ QWidget* widget = nullptr;
+ Document* const doc;
+ const View::WidgetOwnership ws;
};
-ViewPrivate::ViewPrivate()
+ViewPrivate::ViewPrivate(Document* doc, View::WidgetOwnership ws)
+ : doc(doc)
+ , ws(ws)
{
}
@@ -48,10 +52,9 @@ void ViewPrivate::unsetWidget()
}
View::View(Document *doc, WidgetOwnership ws )
- :QObject(doc), d(new ViewPrivate)
+ : QObject(doc)
+ , d(new ViewPrivate(doc, ws))
{
- d->doc = doc;
- d->ws = ws;
}
View::~View()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic