Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / wizard.h

diff --git a/src/wizard.h b/src/wizard.h
index 97a42e015a03a4a19e3ad0cefa97a0dea4cf58c7..633ba299eb2469996be7228b44074ce085f94c44 100644 (file)
--- a/src/wizard.h
+++ b/src/wizard.h
@@ -26,6 +26,7 @@
 #include <QItemDelegate>
 #include <QPainter>
 
+#include <KIcon>
 #include <KDebug>
 
 #include "ui_wizardstandard_ui.h"
@@ -33,7 +34,8 @@
 #include "ui_wizardcheck_ui.h"
 #include "ui_wizardmltcheck_ui.h"
 
-class WizardDelegate: public QItemDelegate {
+class WizardDelegate: public QItemDelegate
+{
 public:
     WizardDelegate(QAbstractItemView* parent = 0): QItemDelegate(parent) {
     }
@@ -46,7 +48,7 @@ public:
                 painter->setPen(option.palette.color(QPalette::HighlightedText));
                 QColor backgroundColor = option.palette.color(QPalette::Highlight);
                 painter->setBrush(QBrush(backgroundColor));
-                painter->fillRect(r1, QBrush(backgroundColor));
+                painter->fillRect(r1, backgroundColor);
             }
             QFont font = painter->font();
             font.setBold(true);
@@ -69,10 +71,11 @@ public:
 };
 
 
-class Wizard : public QWizard {
+class Wizard : public QWizard
+{
     Q_OBJECT
 public:
-    Wizard(QWidget * parent = 0);
+    Wizard(bool upgrade, QWidget * parent = 0);
     void installExtraMimes(QString baseName, QStringList globs);
     void runUpdateMimeDatabase();
     void adjustSettings();
@@ -85,20 +88,20 @@ private:
     Ui::WizardCheck_UI m_check;
     QVBoxLayout *m_startLayout;
     bool m_systemCheckIsOk;
-    QStringList m_dvProfiles;
-    QStringList m_hdvProfiles;
-    QStringList m_otherProfiles;
-    QMap <QString, QString> m_profilesInfo;
+    QMap <QString, QString> m_dvProfiles;
+    QMap <QString, QString> m_hdvProfiles;
+    QMap <QString, QString> m_otherProfiles;
     void slotCheckPrograms();
     void checkMltComponents();
-    QStringList m_audioCodecs;
-    QStringList m_videoCodecs;
+    KIcon m_okIcon;
+    KIcon m_badIcon;
 
 private slots:
     void slotCheckThumbs();
     void slotCheckStandard();
     void slotCheckSelectedItem();
     void slotCheckMlt();
+    void slotShowWebInfos();
 };
 
 #endif