philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "using namespace Layouting" out of the layouting lib

Browse Source 
Fixes windows build due to ambiguous symbols
This commit is contained in:
Sergio Martins
2020-05-14 22:02:27 +01:00
parent c5d880c124
commit d1d1c983f1
8 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/DockWidgetBase.cpp
View File

@@ -47,7 +47,6 @@
*/
using namespace KDDockWidgets;
using namespace Layouting;
class DockWidgetBase::Private
{
@@ -477,7 +476,7 @@ FloatingWindow *DockWidgetBase::floatingWindow() const
return qobject_cast<FloatingWindow*>(window());
}
void DockWidgetBase::addPlaceholderItem(Item *item)
void DockWidgetBase::addPlaceholderItem(Layouting::Item *item)
{
qCDebug(placeholder) << Q_FUNC_INFO << this << item;
Q_ASSERT(item);
@@ -603,7 +602,7 @@ void DockWidgetBase::Private::restoreToPreviousPosition()
void DockWidgetBase::Private::maybeRestoreToPreviousPosition()
{
// This is called when we get a QEvent::Show. Let's see if we have to restore it to a previous position.
Item *layoutItem = m_lastPosition.layoutItem();
Layouting::Item *layoutItem = m_lastPosition.layoutItem();
qCDebug(placeholder) << Q_FUNC_INFO << layoutItem << m_lastPosition.m_wasFloating;
if (!layoutItem)
return; // nothing to do, no last position