diff options
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/cvs.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs index 90b0e46951..8d4dfc564d 100644 --- a/src/plugins/cvs/cvs.qbs +++ b/src/plugins/cvs/cvs.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcPlugin diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 7dacfd0631..af1d5d2728 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -151,9 +151,9 @@ static inline QString debugCodec(const QTextCodec *c) return c ? QString::fromLatin1(c->name()) : QString::fromLatin1("Null codec"); } -static inline bool messageBoxQuestion(const QString &title, const QString &question, QWidget *parent = 0) +static inline bool messageBoxQuestion(const QString &title, const QString &question) { - return QMessageBox::question(parent, title, question, QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes; + return QMessageBox::question(ICore::dialogParent(), title, question, QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes; } // ------------- CVSPlugin @@ -579,7 +579,8 @@ void CvsPlugin::revertAll() if (revertResponse.result == CvsResponse::Ok) cvsVersionControl()->emitRepositoryChanged(state.topLevel()); else - QMessageBox::warning(0, title, tr("Revert failed: %1").arg(revertResponse.message), QMessageBox::Ok); + QMessageBox::warning(ICore::dialogParent(), title, + tr("Revert failed: %1").arg(revertResponse.message), QMessageBox::Ok); } void CvsPlugin::revertCurrentFile() |