mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-01-13 00:30:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from emoon/mac-compile-warning-fixes

Browse Source 
Compile and warning fixes for macOS
This commit is contained in:
githubuser0xFFFF 2018-05-07 07:37:54 +02:00 committed by GitHub
commit 064cab405a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/MainWindow.h
View File

@ -45,7 +45,7 @@ class CMainWindow : public QMainWindow
Q_OBJECT Q_OBJECT
private: private:
MainWindowPrivate* d;///< private data - pimpl MainWindowPrivate* d;///< private data - pimpl
friend class MainWindowPrivate; friend struct MainWindowPrivate;
protected: protected:
virtual void closeEvent(QCloseEvent* event) override; virtual void closeEvent(QCloseEvent* event) override;

2
src/DockAreaWidget.h
View File

@ -52,7 +52,7 @@ class CDockAreaWidget : public QFrame
Q_OBJECT Q_OBJECT
private: private:
DockAreaWidgetPrivate* d; ///< private data (pimpl) DockAreaWidgetPrivate* d; ///< private data (pimpl)
friend class DockAreaWidgetPrivate; friend struct DockAreaWidgetPrivate;
private slots: private slots:
void onDockWidgetTitleClicked(); void onDockWidgetTitleClicked();

2
src/DockContainerWidget.h
View File

@ -54,7 +54,7 @@ class CDockContainerWidget : public QFrame
Q_OBJECT Q_OBJECT
private: private:
DockContainerWidgetPrivate* d; ///< private data (pimpl) DockContainerWidgetPrivate* d; ///< private data (pimpl)
friend class DockContainerWidgetPrivate; friend struct DockContainerWidgetPrivate;
protected: protected:
/** /**

2
src/DockManager.h
View File

@ -49,7 +49,7 @@ class CDockManager : public CDockContainerWidget
Q_OBJECT Q_OBJECT
private: private:
DockManagerPrivate* d; ///< private data (pimpl) DockManagerPrivate* d; ///< private data (pimpl)
friend class DockManagerPrivate; friend struct DockManagerPrivate;
protected: protected:

4
src/DockOverlay.h
View File

@ -44,7 +44,7 @@ class CDockOverlay : public QFrame
Q_OBJECT Q_OBJECT
private: private:
DockOverlayPrivate* d; //< private data class DockOverlayPrivate* d; //< private data class
friend class DockOverlayPrivate; friend struct DockOverlayPrivate;
friend class DockOverlayCross; friend class DockOverlayCross;
public: public:
@ -118,7 +118,7 @@ class CDockOverlayCross : public QWidget
Q_OBJECT Q_OBJECT
private: private:
DockOverlayCrossPrivate* d; DockOverlayCrossPrivate* d;
friend class DockOverlayCrossPrivate; friend struct DockOverlayCrossPrivate;
friend class CDockOverlay; friend class CDockOverlay;
public: public:

2
src/DockSplitter.h
View File

@ -43,7 +43,7 @@ class CDockSplitter : public QSplitter
Q_OBJECT Q_OBJECT
private: private:
DockSplitterPrivate* d; DockSplitterPrivate* d;
friend class DockSplitterPrivate; friend struct DockSplitterPrivate;
public: public:
CDockSplitter(QWidget *parent = Q_NULLPTR); CDockSplitter(QWidget *parent = Q_NULLPTR);

4
src/DockWidget.h
View File

@ -52,14 +52,14 @@ class CDockWidget : public QFrame
Q_OBJECT Q_OBJECT
private: private:
DockWidgetPrivate* d; ///< private data (pimpl) DockWidgetPrivate* d; ///< private data (pimpl)
friend class DockWidgetPrivate; friend struct DockWidgetPrivate;
protected: protected:
friend class CDockContainerWidget; friend class CDockContainerWidget;
friend class CDockAreaWidget; friend class CDockAreaWidget;
friend class CFloatingDockContainer; friend class CFloatingDockContainer;
friend class CDockManager; friend class CDockManager;
friend class DockContainerWidgetPrivate; friend struct DockContainerWidgetPrivate;
/** /**
* Assigns the dock manager that manages this dock widget * Assigns the dock manager that manages this dock widget

2
src/DockWidgetTitleBar.h
View File

@ -48,7 +48,7 @@ class CDockWidgetTitleBar : public QFrame
private: private:
DockWidgetTitleBarPrivate* d; ///< private data (pimpl) DockWidgetTitleBarPrivate* d; ///< private data (pimpl)
friend class DockWidgetTitleBarPrivate; friend struct DockWidgetTitleBarPrivate;
protected: protected:
virtual void mousePressEvent(QMouseEvent* ev) override; virtual void mousePressEvent(QMouseEvent* ev) override;

2
src/FloatingDockContainer.h
View File

@ -51,7 +51,7 @@ class CFloatingDockContainer : public QWidget
Q_OBJECT Q_OBJECT
private: private:
FloatingDockContainerPrivate* d; ///< private data (pimpl) FloatingDockContainerPrivate* d; ///< private data (pimpl)
friend class FloatingDockContainerPrivate; friend struct FloatingDockContainerPrivate;
private slots: private slots:
void onDockAreasAddedOrRemoved(); void onDockAreasAddedOrRemoved();

10
src/ads_globals.cpp
View File

@ -62,12 +62,12 @@ CDockInsertParam dockAreaInsertParameters(DockWidgetArea Area)
{ {
switch (Area) switch (Area)
{ {
case TopDockWidgetArea: return QPair<Qt::Orientation, bool>(Qt::Vertical, false); case TopDockWidgetArea: return CDockInsertParam(Qt::Vertical, false);
case RightDockWidgetArea: return QPair<Qt::Orientation, bool>(Qt::Horizontal, true); case RightDockWidgetArea: return CDockInsertParam(Qt::Horizontal, true);
case CenterDockWidgetArea: case CenterDockWidgetArea:
case BottomDockWidgetArea: return QPair<Qt::Orientation, bool>(Qt::Vertical, true); case BottomDockWidgetArea: return CDockInsertParam(Qt::Vertical, true);
case LeftDockWidgetArea: return QPair<Qt::Orientation, bool>(Qt::Horizontal, false); case LeftDockWidgetArea: return CDockInsertParam(Qt::Horizontal, false);
default: QPair<Qt::Orientation, bool>(Qt::Vertical, false); default: CDockInsertParam(Qt::Vertical, false);
} // switch (Area) } // switch (Area)
return CDockInsertParam(Qt::Vertical, false); return CDockInsertParam(Qt::Vertical, false);