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

List:       kde-commits
Subject:    branches/work/~aclemens/kde4ports/removeredeyes
From:       Andi Clemens <andi.clemens () gmx ! net>
Date:       2008-06-30 21:19:32
Message-ID: 1214860772.014340.18305.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 826511 by aclemens:

all Qt3 includes are replaced by Qt4 headers

 M  +1 -1      imageslist.cpp  
 M  +6 -7      redeyeswidget.cpp  
 M  +1 -1      redeyeswidget.h  
 M  +6 -7      redeyeswindow.cpp  
 M  +7 -7      workerthread.cpp  


--- branches/work/~aclemens/kde4ports/removeredeyes/imageslist.cpp #826510:826511
@@ -33,7 +33,7 @@
 #include <QLabel>
 #include <QPainter>
 #include <QPushButton>
-#include <QUrl>Q3GroupBox
+#include <QUrl>
 
 // KDE includes
 
--- branches/work/~aclemens/kde4ports/removeredeyes/redeyeswidget.cpp #826510:826511
@@ -25,18 +25,17 @@
 
 // Qt includes
 
-#include <QProgressBar>
-#include <QVBoxLayout>
-#include <QLineEdit>
-
 #include <QButtonGroup>
-#include <QGroupBox>
 #include <QCheckBox>
+#include <QGroupBox>
+#include <QLabel>
 #include <QLineEdit>
+#include <QLineEdit>
 #include <QProgressBar>
-#include <QSpinBox>
+#include <QProgressBar>
 #include <QRadioButton>
-#include <QLabel>
+#include <QSpinBox>
+#include <QVBoxLayout>
 
 // KDE includes
 
--- branches/work/~aclemens/kde4ports/removeredeyes/redeyeswidget.h #826510:826511
@@ -26,7 +26,7 @@
 #ifndef REDEYESWIDGET_H
 #define REDEYESWIDGET_H
 
-#include <qwidget.h>
+#include <QWidget>
 
 class QButtonGroup;
 class QGroupBox;
--- branches/work/~aclemens/kde4ports/removeredeyes/redeyeswindow.cpp #826510:826511
@@ -25,12 +25,12 @@
 
 // Qt includes
 
-#include <QProgressBar>
-#include <QCustomEvent>
-#include <QTimer>
-#include <QLineEdit>
 #include <QButtonGroup>
 #include <QCheckBox>
+#include <QCustomEvent>
+#include <QLineEdit>
+#include <QProgressBar>
+#include <QTimer>
 
 // KDE includes
 
@@ -40,15 +40,14 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
+#include <kmenu.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kmenu.h>
 #include <ktabwidget.h>
 #include <kurlrequester.h>
 
-// Libkipi includes
+// libkipi includes
 
-// #include <libkipi/imagedialog.h>
 #include <libkipi/interface.h>
 
 // local includes
--- branches/work/~aclemens/kde4ports/removeredeyes/workerthread.cpp #826510:826511
@@ -25,13 +25,13 @@
 
 // Qt includes
 
-#include <Q3CString>
-#include <QProgressBar>
+#include <QApplication>
+#include <QByteArray>
 #include <QDir>
+#include <QEvent>
 #include <QFile>
 #include <QFileInfo>
-#include <QEvent>
-#include <QApplication>
+#include <QProgressBar>
 
 // KDE includes
 
@@ -79,8 +79,8 @@
         postProgress(false, url, i, total);
 
         // we need to convert the QString to const char* for openCV to work
-        Q3CString src = QFile::encodeName(url.path());
-        Q3CString cls = QFile::encodeName(m_settings->classifierFile);
+        QByteArray src = QFile::encodeName(url.path());
+        QByteArray cls = QFile::encodeName(m_settings->classifierFile);
 
         // find and remove red eyes
         EyeLocator* loc = new EyeLocator(src.data(),
@@ -122,7 +122,7 @@
                 saveLocation.addPath(info.fileName());
             }
 
-            Q3CString dest = QFile::encodeName(saveLocation.path());
+            QByteArray dest = QFile::encodeName(saveLocation.path());
             loc->saveImage(dest.data());
         }
 
[prev in list] [next in list] [prev in thread] [next in thread]