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

List:       kde-commits
Subject:    [kphotoalbum] /: Fixed some compilation errors without kdelibs4support.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2016-08-21 7:17:47
Message-ID: E1bbN0t-0008Qz-6F () code ! kde ! org
[Download RAW message or body]

Git commit b6d74c6acf2da94255e54fb703f037588426c5b3 by Tobias Leupold.
Committed on 21/08/2016 at 07:17.
Pushed by tleupold into branch 'master'.

Fixed some compilation errors without kdelibs4support.

M  +1    -1    DB/ImageSearchInfo.cpp
M  +2    -2    ImageManager/RawImageDecoder.cpp
M  +4    -5    ImageManager/VideoLengthExtractor.cpp
M  +1    -1    ImportExport/Export.cpp
M  +1    -1    ImportExport/Import.cpp
M  +1    -1    ImportExport/ImportDialog.cpp
M  +1    -1    MainWindow/Window.cpp

http://commits.kde.org/kphotoalbum/b6d74c6acf2da94255e54fb703f037588426c5b3

diff --git a/DB/ImageSearchInfo.cpp b/DB/ImageSearchInfo.cpp
index 8afe9f0..897403c 100644
--- a/DB/ImageSearchInfo.cpp
+++ b/DB/ImageSearchInfo.cpp
@@ -21,8 +21,8 @@
 
 #include <QDebug>
 #include <QRegExp>
+#include <QApplication>
 
-#include <KApplication>
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KSharedConfig>
diff --git a/ImageManager/RawImageDecoder.cpp b/ImageManager/RawImageDecoder.cpp
index 026c6e1..d20e9dc 100644
--- a/ImageManager/RawImageDecoder.cpp
+++ b/ImageManager/RawImageDecoder.cpp
@@ -102,10 +102,10 @@ void RAWImageDecoder::_initializeExtensionLists( QStringList& \
rawExtensions, QSt  static bool extensionListsInitialized = false;
     if ( ! extensionListsInitialized ) {
 #ifdef HAVE_KDCRAW
-        _rawExtensions = QString::fromAscii( raw_file_extentions ).split( \
QChar::fromLatin1(' '), QString::SkipEmptyParts ); +        _rawExtensions = \
QString::fromLatin1( raw_file_extentions ).split( QChar::fromLatin1(' '), \
QString::SkipEmptyParts );  #endif /* HAVE_KDCRAW */
         for (QStringList::iterator it = _rawExtensions.begin(); it != \
                _rawExtensions.end(); ++it)
-            (*it).remove( QString::fromAscii("*.") );
+            (*it).remove(QString::fromUtf8("*."));
 
         _standardExtensions << QString::fromLatin1("jpg")
                             << QString::fromLatin1("JPG")
diff --git a/ImageManager/VideoLengthExtractor.cpp \
b/ImageManager/VideoLengthExtractor.cpp index b2a6f13..6ac21d5 100644
--- a/ImageManager/VideoLengthExtractor.cpp
+++ b/ImageManager/VideoLengthExtractor.cpp
@@ -21,7 +21,6 @@
 #include <Utilities/Process.h>
 #include <QDir>
 #include <MainWindow/FeatureDialog.h>
-#include <KDebug>
 #include <QDebug>
 
 #define STR(x) QString::fromUtf8(x)
@@ -71,7 +70,7 @@ void ImageManager::VideoLengthExtractor::processEnded()
     QStringList list = m_process->stdout().split(QChar::fromLatin1('\n'));
     list = list.filter(STR("ID_LENGTH="));
     if ( list.count() == 0 ) {
-        kWarning() << "Unable to find ID_LENGTH in output from MPlayer for file " << \
m_fileName.absolute() << "\n" +        qWarning() << "Unable to find ID_LENGTH in \
output from MPlayer for file " << m_fileName.absolute() << "\n"  << "Output was:\n"
                    << m_process->stdout();
         emit unableToDetermineLength();
@@ -82,7 +81,7 @@ void ImageManager::VideoLengthExtractor::processEnded()
     const QRegExp regexp(STR("ID_LENGTH=([0-9.]+)"));
     bool ok = regexp.exactMatch(match);
     if ( !ok ) {
-        kWarning() << STR("Unable to match regexp for string: %1 (for file \
%2)").arg(match).arg(m_fileName.absolute()); +        qWarning() << STR("Unable to \
match regexp for string: %1 (for file %2)").arg(match).arg(m_fileName.absolute());  \
emit unableToDetermineLength();  return;
     }
@@ -91,13 +90,13 @@ void ImageManager::VideoLengthExtractor::processEnded()
 
     const double length = cap.toDouble(&ok);
     if ( !ok ) {
-        kWarning() << STR("Unable to convert string \"%1\"to integer (for file \
%2)").arg(cap).arg(m_fileName.absolute()); +        qWarning() << STR("Unable to \
convert string \"%1\"to integer (for file %2)").arg(cap).arg(m_fileName.absolute());  \
emit unableToDetermineLength();  return;
     }
 
     if ( length == 0 ) {
-        kWarning() << "video length returned was 0 for file " << \
m_fileName.absolute(); +        qWarning() << "video length returned was 0 for file " \
<< m_fileName.absolute();  emit unableToDetermineLength();
         return;
     }
diff --git a/ImportExport/Export.cpp b/ImportExport/Export.cpp
index 6aa4a92..b1050cd 100644
--- a/ImportExport/Export.cpp
+++ b/ImportExport/Export.cpp
@@ -28,8 +28,8 @@
 #include <QRadioButton>
 #include <QSpinBox>
 #include <QVBoxLayout>
+#include <QFileDialog>
 
-#include <KFileDialog>
 #include <KHelpClient>
 #include <KLocalizedString>
 #include <KMessageBox>
diff --git a/ImportExport/Import.cpp b/ImportExport/Import.cpp
index c4ad3c6..9457fb0 100644
--- a/ImportExport/Import.cpp
+++ b/ImportExport/Import.cpp
@@ -19,8 +19,8 @@
 
 #include <QFileDialog>
 #include <QTemporaryFile>
+#include <QFileDialog>
 
-#include <KFileDialog>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KLocalizedString>
diff --git a/ImportExport/ImportDialog.cpp b/ImportExport/ImportDialog.cpp
index 39ae62f..5243764 100644
--- a/ImportExport/ImportDialog.cpp
+++ b/ImportExport/ImportDialog.cpp
@@ -29,8 +29,8 @@
 #include <QPushButton>
 #include <QScrollArea>
 #include <QDir>
+#include <QFileDialog>
 
-#include <KFileDialog>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KHelpClient>
diff --git a/MainWindow/Window.cpp b/MainWindow/Window.cpp
index aa53ae0..57742c6 100644
--- a/MainWindow/Window.cpp
+++ b/MainWindow/Window.cpp
@@ -1826,7 +1826,7 @@ void MainWindow::Window::createSarchBar()
     // Set up the search tool bar
     SearchBar* bar = new SearchBar( this );
     bar->setLineEditEnabled(false);
-    bar->setObjectName( QString::fromAscii("searchBar" ) );
+    bar->setObjectName(QString::fromUtf8("searchBar"));
 
     connect(bar, &SearchBar::textChanged, m_browser, \
                &Browser::BrowserWidget::slotLimitToMatch);
     connect(bar, &SearchBar::returnPressed, m_browser, \
&Browser::BrowserWidget::slotInvokeSeleted);


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