diff options
Diffstat (limited to 'src/frontend/display/cplainwritedisplay.cpp')
| -rw-r--r-- | src/frontend/display/cplainwritedisplay.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/frontend/display/cplainwritedisplay.cpp b/src/frontend/display/cplainwritedisplay.cpp index e4b22d5..5d04067 100644 --- a/src/frontend/display/cplainwritedisplay.cpp +++ b/src/frontend/display/cplainwritedisplay.cpp @@ -2,24 +2,24 @@ * * This file is part of BibleTime's source code, http://www.bibletime.info/. * -* Copyright 1999-2014 by the BibleTime developers. +* Copyright 1999-2016 by the BibleTime developers. * The BibleTime source code is licensed under the GNU General Public License version 2.0. * **********/ #include "frontend/display/cplainwritedisplay.h" -#include <QSharedPointer> +#include <memory> #include <QDragEnterEvent> #include <QDragMoveEvent> #include <QDropEvent> #include <QMenu> - #include "backend/keys/cswordkey.h" #include "frontend/cdragdrop.h" #include "frontend/displaywindow/btactioncollection.h" #include "frontend/displaywindow/cdisplaywindow.h" #include "frontend/displaywindow/cplainwritewindow.h" +#include "util/btconnect.h" CPlainWriteDisplay::CPlainWriteDisplay(CPlainWriteWindow * parentWindow, QWidget * parent) @@ -30,8 +30,8 @@ CPlainWriteDisplay::CPlainWriteDisplay(CPlainWriteWindow * parentWindow, QWidget setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(this, SIGNAL(textChanged()), - connectionsProxy(), SLOT(emitTextChanged())); + BT_CONNECT(this, SIGNAL(textChanged()), + connectionsProxy(), SLOT(emitTextChanged())); } /** Reimplementation. */ @@ -48,7 +48,7 @@ void CPlainWriteDisplay::setText( const QString& newText ) { QTextEdit::setText(text); } -bool CPlainWriteDisplay::hasSelection() { +bool CPlainWriteDisplay::hasSelection() const { /// \todo test this return textCursor().hasSelection(); } @@ -123,7 +123,7 @@ void CPlainWriteDisplay::dropEvent( QDropEvent* e ) { for (it = items.begin(); it != items.end(); ++it) { CSwordModuleInfo *module = CSwordBackend::instance()->findModuleByName((*it).module()); - QSharedPointer<CSwordKey> key( CSwordKey::createInstance(module) ); + std::unique_ptr<CSwordKey> key(CSwordKey::createInstance(module)); key->setKey((*it).key()); QString moduleText = key->strippedText(); |