Commit de84e0f9 authored by Claudio Valerio's avatar Claudio Valerio

removed a couple of warning

No related merge requests found
...@@ -102,6 +102,8 @@ MOC_DIR = $$BUILD_DIR/moc ...@@ -102,6 +102,8 @@ MOC_DIR = $$BUILD_DIR/moc
RCC_DIR = $$BUILD_DIR/rcc RCC_DIR = $$BUILD_DIR/rcc
UI_DIR = $$BUILD_DIR/ui UI_DIR = $$BUILD_DIR/ui
QMAKE_CXXFLAGS += -std=c++11
win32 { win32 {
RC_FILE = resources/win/OpenBoard.rc RC_FILE = resources/win/OpenBoard.rc
CONFIG += qaxcontainer CONFIG += qaxcontainer
......
...@@ -68,7 +68,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject ...@@ -68,7 +68,6 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
QList<UBGraphicsDelegateFrame *> getLinkedFrames(); QList<UBGraphicsDelegateFrame *> getLinkedFrames();
private: private:
qreal mTitleBarHeight;
QRectF bottomRightResizeGripRect() const; QRectF bottomRightResizeGripRect() const;
QRectF bottomResizeGripRect() const; QRectF bottomResizeGripRect() const;
QRectF leftResizeGripRect() const; QRectF leftResizeGripRect() const;
...@@ -143,6 +142,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject ...@@ -143,6 +142,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
bool mResizing; bool mResizing;
bool mMirroredXAtStart; bool mMirroredXAtStart;
bool mMirroredYAtStart; bool mMirroredYAtStart;
qreal mTitleBarHeight;
QList<UBGraphicsDelegateFrame *> mLinkedFrames; QList<UBGraphicsDelegateFrame *> mLinkedFrames;
}; };
......
...@@ -44,9 +44,9 @@ QColor UBGraphicsTextItem::lastUsedTextColor; ...@@ -44,9 +44,9 @@ QColor UBGraphicsTextItem::lastUsedTextColor;
UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent)
: QGraphicsTextItem(parent) : QGraphicsTextItem(parent)
, UBGraphicsItem() , UBGraphicsItem()
, mTypeTextHereLabel(tr("<Type Text Here>"))
, mMultiClickState(0) , mMultiClickState(0)
, mLastMousePressTime(QTime::currentTime()) , mLastMousePressTime(QTime::currentTime())
, mTypeTextHereLabel(tr("<Type Text Here>"))
, isActivatedTextEditor(true) , isActivatedTextEditor(true)
{ {
setDelegate(new UBGraphicsTextItemDelegate(this, 0)); setDelegate(new UBGraphicsTextItemDelegate(this, 0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment