[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcompletion] /: Fix compile with strict compile flags
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-13 11:56:36
Message-ID: E1g0QEe-0005qt-TT () code ! kde ! org
[Download RAW message or body]

Git commit 2f05957369b3330a79334d6d0754bd225e04ae2c by Laurent Montel.
Committed on 13/09/2018 at 11:56.
Pushed by mlaurent into branch 'master'.

Fix compile with strict compile flags

M  +5    -1    CMakeLists.txt
M  +5    -5    src/klineedit.cpp

https://commits.kde.org/kcompletion/2f05957369b3330a79334d6d0754bd225e04ae2c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4979b91..c7b3304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,11 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED \
Widgets)  find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
 
-remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+add_definitions(-DQT_NO_CAST_FROM_ASCII)
+add_definitions(-DQT_NO_CAST_TO_ASCII)
+add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DQT_USE_QSTRINGBUILDER)
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt \
Creator & KDevelop)" OFF)  add_feature_info(QCH ${BUILD_QCH} "API documentation in \
                QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
diff --git a/src/klineedit.cpp b/src/klineedit.cpp
index 82c8b75..c00fffa 100644
--- a/src/klineedit.cpp
+++ b/src/klineedit.cpp
@@ -107,7 +107,7 @@ void KLineEditPrivate::init()
     // By default the text is set in italic, which may not be appropriate
     // for some languages and scripts (e.g. for CJK ideographs).
     QString metaMsg = KLineEdit::tr("1", "Italic placeholder text in line edits: 0 \
                no, 1 yes");
-    italicizePlaceholder = (metaMsg.trimmed() != QString('0'));
+    italicizePlaceholder = (metaMsg.trimmed() != QLatin1Char('0'));
     //---
     possibleTripleClick = false;
     bgRole = q->backgroundRole();
@@ -395,7 +395,7 @@ void KLineEditPrivate::setSqueezedText()
 
         // estimate how many letters we can add to the dots on both sides
         int letters = fullText.length() * (labelWidth - squeezedWidth) / textWidth / \
                2;
-        squeezedText = fullText.left(letters) + "..." + fullText.right(letters);
+        squeezedText = fullText.left(letters) + QStringLiteral("...") + \
fullText.right(letters);  squeezedWidth = fm.width(squeezedText);
 
         if (squeezedWidth < labelWidth) {
@@ -403,17 +403,17 @@ void KLineEditPrivate::setSqueezedText()
             // add letters while text < label
             do {
                 letters++;
-                squeezedText = fullText.left(letters) + "..." + \
fullText.right(letters); +                squeezedText = fullText.left(letters) + \
QStringLiteral("...") + fullText.right(letters);  squeezedWidth = \
                fm.width(squeezedText);
             } while (squeezedWidth < labelWidth && letters <= fullLength / 2);
             letters--;
-            squeezedText = fullText.left(letters) + "..." + fullText.right(letters);
+            squeezedText = fullText.left(letters) + QStringLiteral("...") + \
fullText.right(letters);  } else if (squeezedWidth > labelWidth) {
             // we estimated too long
             // remove letters while text > label
             do {
                 letters--;
-                squeezedText = fullText.left(letters) + "..." + \
fullText.right(letters); +                squeezedText = fullText.left(letters) + \
QStringLiteral("...") + fullText.right(letters);  squeezedWidth = \
fm.width(squeezedText);  } while (squeezedWidth > labelWidth && letters >= 5);
         }


[prev in list] [next in list] [prev in thread] [next in thread]