Swiftdiff options
Diffstat (limited to 'Swift/QtUI/Whiteboard')
| -rw-r--r-- | Swift/QtUI/Whiteboard/ColorWidget.cpp | 11 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/FreehandLineItem.cpp | 7 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/FreehandLineItem.h | 9 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/GView.cpp | 11 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/GView.h | 16 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/QtWhiteboardWindow.h | 33 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/TextDialog.cpp | 8 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/TextDialog.h | 16 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h | 13 |
10 files changed, 94 insertions, 34 deletions
diff --git a/Swift/QtUI/Whiteboard/ColorWidget.cpp b/Swift/QtUI/Whiteboard/ColorWidget.cpp index e96b760..e12ade1 100644 --- a/Swift/QtUI/Whiteboard/ColorWidget.cpp +++ b/Swift/QtUI/Whiteboard/ColorWidget.cpp @@ -4,10 +4,17 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + + +#include <Swift/QtUI/Whiteboard/ColorWidget.h> -#include "ColorWidget.h" -#include <QPainter> #include <QMouseEvent> +#include <QPainter> namespace Swift { ColorWidget::ColorWidget(QWidget* parent) : QWidget(parent) { diff --git a/Swift/QtUI/Whiteboard/FreehandLineItem.cpp b/Swift/QtUI/Whiteboard/FreehandLineItem.cpp index 8821062..f4808d6 100644 --- a/Swift/QtUI/Whiteboard/FreehandLineItem.cpp +++ b/Swift/QtUI/Whiteboard/FreehandLineItem.cpp @@ -4,8 +4,13 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "FreehandLineItem.h" +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ +#include <Swift/QtUI/Whiteboard/FreehandLineItem.h> namespace Swift { FreehandLineItem::FreehandLineItem(QGraphicsItem* parent) : QGraphicsItem(parent) { diff --git a/Swift/QtUI/Whiteboard/FreehandLineItem.h b/Swift/QtUI/Whiteboard/FreehandLineItem.h index b1af3d1..db37460 100644 --- a/Swift/QtUI/Whiteboard/FreehandLineItem.h +++ b/Swift/QtUI/Whiteboard/FreehandLineItem.h @@ -4,11 +4,18 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once +#include <iostream> + #include <QGraphicsItem> #include <QPainter> -#include <iostream> namespace Swift { class FreehandLineItem : public QGraphicsItem { diff --git a/Swift/QtUI/Whiteboard/GView.cpp b/Swift/QtUI/Whiteboard/GView.cpp index f92322a..9134d58 100644 --- a/Swift/QtUI/Whiteboard/GView.cpp +++ b/Swift/QtUI/Whiteboard/GView.cpp @@ -4,8 +4,15 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "GView.h" -#include <QtSwiftUtil.h> +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + +#include <Swift/QtUI/Whiteboard/GView.h> + +#include <Swift/QtUI/QtSwiftUtil.h> namespace Swift { GView::GView(QGraphicsScene* scene, QWidget* parent) : QGraphicsView(scene, parent), zValue(0), mousePressed(false), brush(QColor(Qt::white)), defaultBrush(QColor(Qt::white)), mode(GView::Select), lastItem(NULL), selectionRect(NULL), textDialog(NULL) { diff --git a/Swift/QtUI/Whiteboard/GView.h b/Swift/QtUI/Whiteboard/GView.h index bc64589..1cf5275 100644 --- a/Swift/QtUI/Whiteboard/GView.h +++ b/Swift/QtUI/Whiteboard/GView.h @@ -4,17 +4,25 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once -#include <QGraphicsView> +#include <iostream> + #include <QGraphicsLineItem> +#include <QGraphicsView> #include <QMouseEvent> #include <QPen> -#include <iostream> + #include <Swiften/Base/IDGenerator.h> -#include "TextDialog.h" -#include "FreehandLineItem.h" +#include <Swift/QtUI/Whiteboard/FreehandLineItem.h> +#include <Swift/QtUI/Whiteboard/TextDialog.h> namespace Swift { class GView : public QGraphicsView { diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp index 916246c..ca887d1 100644 --- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp +++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp @@ -5,12 +5,12 @@ */ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "QtWhiteboardWindow.h" +#include <Swift/QtUI/Whiteboard/QtWhiteboardWindow.h> #include <iostream> diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h index 3957bb7..862ae66 100644 --- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h +++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h @@ -4,28 +4,35 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#pragma once +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ -#include <Swift/Controllers/UIInterfaces/WhiteboardWindow.h> -#include <Swiften/Elements/Message.h> -#include <Swiften/Whiteboard/WhiteboardSession.h> -#include <Swiften/Elements/Whiteboard/WhiteboardElement.h> +#pragma once -#include <QWidget> -#include <QGraphicsView> +#include <QCloseEvent> +#include <QColorDialog> #include <QGraphicsScene> -#include <QVBoxLayout> -#include <QHBoxLayout> +#include <QGraphicsView> #include <QGridLayout> +#include <QHBoxLayout> #include <QPainter> #include <QPushButton> #include <QSpinBox> -#include <QColorDialog> #include <QToolButton> -#include <QCloseEvent> +#include <QVBoxLayout> +#include <QWidget> + +#include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Whiteboard/WhiteboardElement.h> +#include <Swiften/Whiteboard/WhiteboardSession.h> + +#include <Swift/Controllers/UIInterfaces/WhiteboardWindow.h> -#include "GView.h" -#include "ColorWidget.h" +#include <Swift/QtUI/Whiteboard/ColorWidget.h> +#include <Swift/QtUI/Whiteboard/GView.h> namespace Swift { class QtWhiteboardWindow : public QWidget, public WhiteboardWindow diff --git a/Swift/QtUI/Whiteboard/TextDialog.cpp b/Swift/QtUI/Whiteboard/TextDialog.cpp index 021895a..13d83d5 100644 --- a/Swift/QtUI/Whiteboard/TextDialog.cpp +++ b/Swift/QtUI/Whiteboard/TextDialog.cpp @@ -4,7 +4,13 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "TextDialog.h" +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + +#include <Swift/QtUI/Whiteboard/TextDialog.h> namespace Swift { TextDialog::TextDialog(QGraphicsTextItem* item, QWidget* parent) : QDialog(parent) diff --git a/Swift/QtUI/Whiteboard/TextDialog.h b/Swift/QtUI/Whiteboard/TextDialog.h index 64a0fe2..911bd37 100644 --- a/Swift/QtUI/Whiteboard/TextDialog.h +++ b/Swift/QtUI/Whiteboard/TextDialog.h @@ -4,17 +4,23 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once +#include <iostream> + #include <QDialog> -#include <QVBoxLayout> -#include <QHBoxLayout> #include <QDialogButtonBox> -#include <QLineEdit> #include <QGraphicsTextItem> +#include <QHBoxLayout> +#include <QLineEdit> #include <QSpinBox> - -#include <iostream> +#include <QVBoxLayout> namespace Swift { class TextDialog : public QDialog diff --git a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h index 74c6c1d..4d37704 100644 --- a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h +++ b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h @@ -4,16 +4,23 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once #include <Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h> +#include <Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h> +#include <Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h> #include <Swiften/Elements/Whiteboard/WhiteboardLineElement.h> #include <Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h> #include <Swiften/Elements/Whiteboard/WhiteboardTextElement.h> -#include <Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h> -#include <Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h> + +#include <Swift/QtUI/QtSwiftUtil.h> #include <Swift/QtUI/Whiteboard/GView.h> -#include <QtSwiftUtil.h> namespace Swift { class WhiteboardElementDrawingVisitor : public WhiteboardElementVisitor { |