diff options
Diffstat (limited to 'src/libs/utils')
-rw-r--r-- | src/libs/utils/devicefileaccess.cpp | 10 | ||||
-rw-r--r-- | src/libs/utils/filepath.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/filesystemmodel.cpp | 4 | ||||
-rw-r--r-- | src/libs/utils/fileutils.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/fsengine/fsenginehandler.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/iconbutton.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/icondisplay.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/markdownbrowser.cpp | 12 | ||||
-rw-r--r-- | src/libs/utils/mimetypes2/mimeprovider.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/mimetypes2/mimetypeparser.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/outputformatter.h | 2 | ||||
-rw-r--r-- | src/libs/utils/passworddialog.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/plaintextedit/plaintextedit.cpp | 8 | ||||
-rw-r--r-- | src/libs/utils/plaintextedit/widgettextcontrol.cpp | 36 | ||||
-rw-r--r-- | src/libs/utils/terminalinterface.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/unarchiver.cpp | 4 |
16 files changed, 47 insertions, 47 deletions
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index 4a4bddcfd0b..1d9eafa53ac 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -396,7 +396,7 @@ Result<FilePath> DeviceFileAccess::createTempFile(const FilePath &filePath) Utils::Result<std::unique_ptr<FilePathWatcher>> DeviceFileAccess::watch( const FilePath &path) const { - Q_UNUSED(path); + Q_UNUSED(path) return ResultError(Tr::tr("watch is not implemented.")); } @@ -484,7 +484,7 @@ bool UnavailableDeviceFileAccess::hasHardLinks(const FilePath &filePath) const Result<> UnavailableDeviceFileAccess::ensureWritableDirectory(const FilePath &filePath) const { - Q_UNUSED(filePath); + Q_UNUSED(filePath) return ResultError(unavailableMessage()); } @@ -636,7 +636,7 @@ Result<FilePath> UnavailableDeviceFileAccess::createTempFile(const FilePath &fil Result<std::unique_ptr<FilePathWatcher>> UnavailableDeviceFileAccess::watch(const FilePath &path) const { - Q_UNUSED(path); + Q_UNUSED(path) return ResultError(unavailableMessage()); } @@ -1201,13 +1201,13 @@ Utils::Result<std::unique_ptr<FilePathWatcher>> DesktopDeviceFileAccess::watch( QTextCodec *DesktopDeviceFileAccess::processStdOutCodec(const FilePath &executable) const { - Q_UNUSED(executable); + Q_UNUSED(executable) return QTextCodec::codecForLocale(); } QTextCodec *DesktopDeviceFileAccess::processStdErrCodec(const FilePath &executable) const { - Q_UNUSED(executable); + Q_UNUSED(executable) return QTextCodec::codecForLocale(); } diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index c4920c89382..ce808546323 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -2537,7 +2537,7 @@ QTCREATOR_UTILS_EXPORT bool operator>=(const FilePath &first, const FilePath &se QTCREATOR_UTILS_EXPORT size_t qHash(const FilePath &filePath, uint seed) { - Q_UNUSED(seed); + Q_UNUSED(seed) if (filePath.m_hash == 0) { if (filePath.caseSensitivity() == Qt::CaseSensitive) diff --git a/src/libs/utils/filesystemmodel.cpp b/src/libs/utils/filesystemmodel.cpp index cf8f97c52c4..71f90b8d438 100644 --- a/src/libs/utils/filesystemmodel.cpp +++ b/src/libs/utils/filesystemmodel.cpp @@ -1747,8 +1747,8 @@ QMimeData *FileSystemModel::mimeData(const QModelIndexList &indexes) const bool FileSystemModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { - Q_UNUSED(row); - Q_UNUSED(column); + Q_UNUSED(row) + Q_UNUSED(column) if (!parent.isValid() || isReadOnly()) return false; diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 54eccbfe0d2..06efc41e64f 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -193,7 +193,7 @@ static bool saveFileSupportedFileSystem(const FilePath &path) } } #else - Q_UNUSED(path); + Q_UNUSED(path) #endif return true; } diff --git a/src/libs/utils/fsengine/fsenginehandler.cpp b/src/libs/utils/fsengine/fsenginehandler.cpp index 4d69623d846..6821c23398d 100644 --- a/src/libs/utils/fsengine/fsenginehandler.cpp +++ b/src/libs/utils/fsengine/fsenginehandler.cpp @@ -296,7 +296,7 @@ QStringList FSEngineImpl::entryList(QDir::Filters filters, const QStringList &fi QAbstractFileEngine::FileFlags FSEngineImpl::fileFlags(FileFlags type) const { - Q_UNUSED(type); + Q_UNUSED(type) return {g_filePathInfoCache.cached(m_filePath, createCacheData).filePathInfo.fileFlags.toInt()}; } diff --git a/src/libs/utils/iconbutton.cpp b/src/libs/utils/iconbutton.cpp index fec2edf83f2..17b0dcf0ae1 100644 --- a/src/libs/utils/iconbutton.cpp +++ b/src/libs/utils/iconbutton.cpp @@ -20,7 +20,7 @@ IconButton::IconButton(QWidget *parent) void IconButton::paintEvent(QPaintEvent *e) { - Q_UNUSED(e); + Q_UNUSED(e) QPainter p(this); QRect r(QPoint(), size()); diff --git a/src/libs/utils/icondisplay.cpp b/src/libs/utils/icondisplay.cpp index 93999708905..3261786ce9e 100644 --- a/src/libs/utils/icondisplay.cpp +++ b/src/libs/utils/icondisplay.cpp @@ -29,7 +29,7 @@ IconDisplay::~IconDisplay() = default; void IconDisplay::paintEvent(QPaintEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); diff --git a/src/libs/utils/markdownbrowser.cpp b/src/libs/utils/markdownbrowser.cpp index 459bf5e0e52..d5ec078d740 100644 --- a/src/libs/utils/markdownbrowser.cpp +++ b/src/libs/utils/markdownbrowser.cpp @@ -145,7 +145,7 @@ public: QSizeF intrinsicSize(QTextDocument *doc, int pos, const QTextFormat &format) override { - Q_UNUSED(pos); + Q_UNUSED(pos) if (!doc || !format.hasProperty(isCopiedPropertyId())) return QSizeF(0, 0); @@ -163,7 +163,7 @@ public: int pos, const QTextFormat &format) override { - Q_UNUSED(pos); + Q_UNUSED(pos) if (!doc || !format.hasProperty(isCopiedPropertyId())) return; @@ -300,8 +300,8 @@ public: virtual QSizeF intrinsicSize( QTextDocument *doc, int posInDocument, const QTextFormat &format) override { - Q_UNUSED(doc); - Q_UNUSED(posInDocument); + Q_UNUSED(doc) + Q_UNUSED(posInDocument) QSize result = Utils::Icons::UNKNOWN_FILE.icon().actualSize(QSize(16, 16)); QString name = format.toImageFormat().name(); @@ -329,8 +329,8 @@ public: int posInDocument, const QTextFormat &format) override { - Q_UNUSED(document); - Q_UNUSED(posInDocument); + Q_UNUSED(document) + Q_UNUSED(posInDocument) const QString name = format.toImageFormat().name(); Entry::Pointer *entryPtr = m_entries.object(name); diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp index d94ba6755f8..b7b5eac1375 100644 --- a/src/libs/utils/mimetypes2/mimeprovider.cpp +++ b/src/libs/utils/mimetypes2/mimeprovider.cpp @@ -591,7 +591,7 @@ MimeBinaryProvider::loadMimeTypeExtra(const QString &mimeName) } return it; #else - Q_UNUSED(mimeName); + Q_UNUSED(mimeName) qWarning("Cannot load mime type since QXmlStreamReader is not available."); return m_mimetypeExtra.cend(); #endif // feature xmlstreamreader diff --git a/src/libs/utils/mimetypes2/mimetypeparser.cpp b/src/libs/utils/mimetypes2/mimetypeparser.cpp index e05183d496b..512f0f5cab7 100644 --- a/src/libs/utils/mimetypes2/mimetypeparser.cpp +++ b/src/libs/utils/mimetypes2/mimetypeparser.cpp @@ -305,7 +305,7 @@ bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString return true; #else - Q_UNUSED(dev); + Q_UNUSED(dev) if (errorMessage) *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName); return false; diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index 4da46bf6f1b..0649956ddff 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -75,7 +75,7 @@ public: // The input is to be considered "complete" for parsing purposes. virtual Result handleLine(const QString &line, OutputFormat format) = 0; - virtual bool handleLink(const QString &href) { Q_UNUSED(href); return false; } + virtual bool handleLink(const QString &href) { Q_UNUSED(href) return false; } virtual bool hasFatalErrors() const { return false; } virtual void flush() {} virtual void runPostPrintActions(QPlainTextEdit *) {} diff --git a/src/libs/utils/passworddialog.cpp b/src/libs/utils/passworddialog.cpp index 6e20f78690a..61bb58cd304 100644 --- a/src/libs/utils/passworddialog.cpp +++ b/src/libs/utils/passworddialog.cpp @@ -27,7 +27,7 @@ ShowPasswordButton::ShowPasswordButton(QWidget *parent) void ShowPasswordButton::paintEvent(QPaintEvent *e) { - Q_UNUSED(e); + Q_UNUSED(e) QIcon icon = isChecked() ? Utils::Icons::EYE_OPEN_TOOLBAR.icon() : Utils::Icons::EYE_CLOSED_TOOLBAR.icon(); QPainter p(this); diff --git a/src/libs/utils/plaintextedit/plaintextedit.cpp b/src/libs/utils/plaintextedit/plaintextedit.cpp index 1a5922eb96c..a4e21243299 100644 --- a/src/libs/utils/plaintextedit/plaintextedit.cpp +++ b/src/libs/utils/plaintextedit/plaintextedit.cpp @@ -152,7 +152,7 @@ public: static inline bool shouldEnableInputMethod(PlainTextEdit *control) { #if defined(Q_OS_ANDROID) - Q_UNUSED(control); + Q_UNUSED(control) return !control->isReadOnly() || (control->textInteractionFlags() & Qt::TextSelectableByMouse); #else return !control->isReadOnly(); @@ -575,7 +575,7 @@ qreal PlainTextEditPrivate::verticalOffset(int topBlock, int topLine) const PlainTextDocumentLayout *documentLayout = qobject_cast<PlainTextDocumentLayout*>(doc->documentLayout()); Q_ASSERT(documentLayout); QRectF r = documentLayout->blockBoundingRect(currentBlock); - Q_UNUSED(r); + Q_UNUSED(r) QTextLayout *layout = currentBlock.layout(); if (layout && topLine <= layout->lineCount()) { QTextLine line = layout->lineAt(topLine - 1); @@ -1894,8 +1894,8 @@ void PlainTextEdit::keyReleaseEvent(QKeyEvent *e) */ QVariant PlainTextEdit::loadResource(int type, const QUrl &name) { - Q_UNUSED(type); - Q_UNUSED(name); + Q_UNUSED(type) + Q_UNUSED(name) return QVariant(); } diff --git a/src/libs/utils/plaintextedit/widgettextcontrol.cpp b/src/libs/utils/plaintextedit/widgettextcontrol.cpp index 78050d57674..3ea0fceee9c 100644 --- a/src/libs/utils/plaintextedit/widgettextcontrol.cpp +++ b/src/libs/utils/plaintextedit/widgettextcontrol.cpp @@ -275,7 +275,7 @@ WidgetTextControlPrivate::WidgetTextControlPrivate(WidgetTextControl *q) bool WidgetTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) { #ifdef QT_NO_SHORTCUT - Q_UNUSED(e); + Q_UNUSED(e) #endif if (cursor.isNull()) @@ -810,9 +810,9 @@ void WidgetTextControlPrivate::_q_contentsChanged(int from, int charsRemoved, in delete ev; } #else - Q_UNUSED(from); - Q_UNUSED(charsRemoved); - Q_UNUSED(charsAdded); + Q_UNUSED(from) + Q_UNUSED(charsRemoved) + Q_UNUSED(charsAdded) #endif } @@ -1049,7 +1049,7 @@ void WidgetTextControl::setTextCursor(const QTextCursor &cursor, bool selectionC if (selectionClipboard) d->setClipboardSelection(); #else - Q_UNUSED(selectionClipboard); + Q_UNUSED(selectionClipboard) #endif } @@ -1503,8 +1503,8 @@ accept: QVariant WidgetTextControl::loadResource(int type, const QUrl &name) { - Q_UNUSED(type); - Q_UNUSED(name); + Q_UNUSED(type) + Q_UNUSED(name) return QVariant(); } @@ -2018,12 +2018,12 @@ bool WidgetTextControlPrivate::sendMouseEventToInputContext( QEvent *e, QEvent::Type eventType, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos) { - Q_UNUSED(eventType); - Q_UNUSED(button); - Q_UNUSED(pos); - Q_UNUSED(modifiers); - Q_UNUSED(buttons); - Q_UNUSED(globalPos); + Q_UNUSED(eventType) + Q_UNUSED(button) + Q_UNUSED(pos) + Q_UNUSED(modifiers) + Q_UNUSED(buttons) + Q_UNUSED(globalPos) #if !defined(QT_NO_IM) if (isPreediting()) { @@ -2042,7 +2042,7 @@ bool WidgetTextControlPrivate::sendMouseEventToInputContext( } } #else - Q_UNUSED(e); + Q_UNUSED(e) #endif return false; } @@ -2050,9 +2050,9 @@ bool WidgetTextControlPrivate::sendMouseEventToInputContext( void WidgetTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget) { #ifdef QT_NO_CONTEXTMENU - Q_UNUSED(screenPos); - Q_UNUSED(docPos); - Q_UNUSED(contextWidget); + Q_UNUSED(screenPos) + Q_UNUSED(docPos) + Q_UNUSED(contextWidget) #else QMenu *menu = q->createStandardContextMenu(docPos, contextWidget); if (!menu) @@ -3322,7 +3322,7 @@ void WidgetTextControlPrivate::append(const QString &text, Qt::TextFormat format tmp.insertText(text); } #else - Q_UNUSED(format); + Q_UNUSED(format) tmp.insertText(text); #endif // QT_NO_TEXTHTMLPARSER if (!cursor.hasSelection()) diff --git a/src/libs/utils/terminalinterface.cpp b/src/libs/utils/terminalinterface.cpp index a7cddd382f4..1a757089460 100644 --- a/src/libs/utils/terminalinterface.cpp +++ b/src/libs/utils/terminalinterface.cpp @@ -418,7 +418,7 @@ void TerminalInterface::start() qint64 TerminalInterface::write(const QByteArray &data) { - Q_UNUSED(data); + Q_UNUSED(data) QTC_CHECK(false); return -1; } diff --git a/src/libs/utils/unarchiver.cpp b/src/libs/utils/unarchiver.cpp index f44d317ccfe..5301ea9ebfb 100644 --- a/src/libs/utils/unarchiver.cpp +++ b/src/libs/utils/unarchiver.cpp @@ -66,7 +66,7 @@ static int _open(struct archive *a, void *client_data) static la_ssize_t _read(struct archive *a, void *client_data, const void **buff) { - Q_UNUSED(a); + Q_UNUSED(a) ReadData *data = static_cast<ReadData *>(client_data); *buff = data->data; return data->file.read(data->data, 10240); @@ -74,7 +74,7 @@ static la_ssize_t _read(struct archive *a, void *client_data, const void **buff) int _close(struct archive *a, void *client_data) { - Q_UNUSED(a); + Q_UNUSED(a) ReadData *data = static_cast<ReadData *>(client_data); data->file.close(); return ARCHIVE_OK; |