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

List:       kde-commits
Subject:    [gwenview] /: --deprecated
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2014-10-31 21:28:18
Message-ID: E1XkJk2-0008DH-4z () scm ! kde ! org
[Download RAW message or body]

Git commit 908b7351b0723471878948fb5b6cfcfd7720033b by Lukáš Tinkl.
Committed on 31/10/2014 at 20:25.
Pushed by lukas into branch 'master'.

--deprecated

M  +1    -1    lib/contextmanager.cpp
M  +1    -1    lib/crop/cropwidget.cpp
M  +8    -8    tests/manual/thumbnailgen.cpp

http://commits.kde.org/gwenview/908b7351b0723471878948fb5b6cfcfd7720033b

diff --git a/lib/contextmanager.cpp b/lib/contextmanager.cpp
index 2a14de6..a3cfff0 100644
--- a/lib/contextmanager.cpp
+++ b/lib/contextmanager.cpp
@@ -74,7 +74,7 @@ struct ContextManagerPrivate
         // the list if we are viewing a non-browsable url, for example
         // using http protocol)
         if (mSelectedFileItemList.isEmpty() && mCurrentUrl.isValid()) {
-            KFileItem item(KFileItem::Unknown, KFileItem::Unknown, mCurrentUrl);
+            KFileItem item(mCurrentUrl);
             mSelectedFileItemList << item;
         }
 
diff --git a/lib/crop/cropwidget.cpp b/lib/crop/cropwidget.cpp
index aaf257d..0b9fda0 100644
--- a/lib/crop/cropwidget.cpp
+++ b/lib/crop/cropwidget.cpp
@@ -155,7 +155,7 @@ struct CropWidgetPrivate : public Ui_CropWidget
         addRatioToComboBox(QSizeF(8.5, 11), i18n("US Letter"));
 
         ratioComboBox->setMaxVisibleItems(ratioComboBox->count());
-        ratioComboBox->setEditText(QString());
+        ratioComboBox->clearEditText();
 
         KLineEdit* edit = qobject_cast<KLineEdit*>(ratioComboBox->lineEdit());
         Q_ASSERT(edit);
diff --git a/tests/manual/thumbnailgen.cpp b/tests/manual/thumbnailgen.cpp
index 34b58f7..fb09670 100644
--- a/tests/manual/thumbnailgen.cpp
+++ b/tests/manual/thumbnailgen.cpp
@@ -26,11 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA \
02110-1301, USA  #include <K4AboutData>
 #include <KApplication>
 #include <KCmdLineArgs>
-#include <KDebug>
 
 // Qt
 #include <QDir>
 #include <QTime>
+#include <QtDebug>
 
 using namespace Gwenview;
 
@@ -56,7 +56,7 @@ int main(int argc, char** argv)
     // Read cmdline options
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if (args->count() != 2) {
-        kFatal() << "Wrong number of arguments";
+        qFatal("Wrong number of arguments");
         return 1;
     }
     QString imageDirName = args->arg(0);
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
     } else if (args->arg(1) == "normal") {
         // group is already set to the right value
     } else {
-        kFatal() << "Invalid thumbnail size:" << args->arg(1);
+        qFatal("Invalid thumbnail size: %s", qPrintable(args->arg(1)));
     }
     QString thumbnailBaseDirName = args->isSet("thumbnail-dir") ? \
args->getOption("thumbnail-dir") : QString();  
@@ -77,7 +77,7 @@ int main(int argc, char** argv)
         if (!dir.exists()) {
             bool ok = QDir::root().mkpath(thumbnailBaseDirName);
             if (!ok) {
-                kFatal() << "Could not create" << thumbnailBaseDirName;
+                qFatal("Could not create %s", qPrintable(thumbnailBaseDirName));
                 return 1;
             }
         }
@@ -92,10 +92,10 @@ int main(int argc, char** argv)
     KFileItemList list;
     Q_FOREACH(const QString &name, dir.entryList()) {
         QUrl url = QUrl::fromLocalFile(dir.absoluteFilePath(name));
-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+        KFileItem item(url);
         list << item;
     }
-    kWarning() << "Generating thumbnails for" << list.count() << "files";
+    qWarning() << "Generating thumbnails for" << list.count() << "files";
 
     // Start the job
     QTime chrono;
@@ -109,13 +109,13 @@ int main(int argc, char** argv)
     QObject::connect(&job, SIGNAL(finished()), &loop, SLOT(quit()));
     loop.exec();
 
-    kWarning() << "Time to generate thumbnails:" << chrono.restart();
+    qWarning() << "Time to generate thumbnails:" << chrono.restart();
 
     waitForDeferredDeletes();
     while (!ThumbnailProvider::isThumbnailWriterEmpty()) {
         QCoreApplication::processEvents();
     }
-    kWarning() << "Time to save pending thumbnails:" << chrono.restart();
+    qWarning() << "Time to save pending thumbnails:" << chrono.restart();
 
     return 0;
 }


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