Q3 support --

svn path=/trunk/KDE/kdemultimedia/juk/; revision=634156

filerenamer.cpp

@@ -36,8 +36,8 @@
 #include <kvbox.h>
 
 #include <QFile>
-#include <q3hbox.h>
-#include <q3vbox.h>
+#include <khbox.h>
+#include <kvbox.h>
 #include <q3scrollview.h>
 #include <QObject>
 #include <QTimer>
@@ -358,7 +358,7 @@ int FileRenamerWidget::addRowCategory(TagType category)
     row.position = m_rows.count();
     int id = row.position;
 
-    Q3HBox *frame = new Q3HBox(m_mainFrame);
+    KHBox *frame = new KHBox(m_mainFrame);
     QPalette palette;
     palette.setColor(frame->backgroundRole(), frame->palette().color(backgroundRole()).dark(110));
     frame->setPalette(palette);
@@ -370,7 +370,7 @@ int FileRenamerWidget::addRowCategory(TagType category)
 
     m_mainFrame->setStretchFactor(frame, 1);
 
-    Q3VBox *buttons = new Q3VBox(frame);
+    KVBox *buttons = new KVBox(frame);
     buttons->setFrameStyle(Q3Frame::Plain | Q3Frame::Box);
     buttons->setLineWidth(1);
 
@@ -392,7 +392,7 @@ int FileRenamerWidget::addRowCategory(TagType category)
     frame->setStretchFactor(label, 1);
     label->setAlignment(Qt::AlignCenter);
 
-    Q3VBox *options = new Q3VBox(frame);
+    KVBox *options = new KVBox(frame);
     row.enableButton = new KPushButton(i18n("Remove"), options);
     toggleMapper->connect(row.enableButton, SIGNAL(clicked()), SLOT(map()));
     toggleMapper->setMapping(row.enableButton, id);
@@ -533,7 +533,7 @@ void FileRenamerWidget::createTagRows()
     connect(upMapper,     SIGNAL(mapped(int)), SLOT(moveItemUp(int)));
     connect(downMapper,   SIGNAL(mapped(int)), SLOT(moveItemDown(int)));
 
-    m_mainFrame = new Q3VBox(m_mainView->viewport());
+    m_mainFrame = new KVBox(m_mainView->viewport());
     m_mainFrame->setMargin(10);
     m_mainFrame->setSpacing(5);
 

filerenamer.h

@@ -33,7 +33,7 @@ class QCheckBox;
 class QLayout;
 class QLayoutItem;
 class QPushButton;
-class Q3VBox;
+class KVBox;
 class PlaylistItem;
 class QSignalMapper;
 
@@ -452,7 +452,7 @@ private slots:
 
 private:
     /// This is the frame that holds all of the category widgets and checkboxes.
-    Q3VBox *m_mainFrame;
+    KVBox *m_mainFrame;
 
     /**
      * This is the meat of the widget, it holds the rows for the user configuration.  It is

statuslabel.cpp

@@ -40,8 +40,8 @@ using namespace ActionCollection;
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-StatusLabel::StatusLabel(PlaylistInterface *playlist, QWidget *parent, const char *name) :
-    Q3HBox(parent, name),
+StatusLabel::StatusLabel(PlaylistInterface *playlist, QWidget *parent) :
+    KHBox(parent),
     PlaylistObserver(playlist),
     m_showTimeRemaining(false)
 {
@@ -82,7 +82,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, QWidget *parent, const cha
     setItemTotalTime(0);
     setItemCurrentTime(0);
 
-    Q3HBox *jumpBox = new Q3HBox(this);
+    KHBox *jumpBox = new KHBox(this);
     jumpBox->setFrameStyle(Box | Sunken);
     jumpBox->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
 

statuslabel.h

@@ -18,7 +18,7 @@
 
 #include "playlistinterface.h"
 
-#include <q3hbox.h>
+#include <khbox.h>
 //Added by qt3to4:
 #include <QLabel>
 #include <QEvent>
@@ -28,12 +28,12 @@ class KSqueezedTextLabel;
 
 class FileHandle;
 
-class StatusLabel : public Q3HBox, public PlaylistObserver
+class StatusLabel : public KHBox, public PlaylistObserver
 {
     Q_OBJECT
 
 public:
-    StatusLabel(PlaylistInterface *playlist, QWidget *parent = 0, const char *name = 0);
+    StatusLabel(PlaylistInterface *playlist, QWidget *parent = 0);
     virtual ~StatusLabel();
     virtual void updateCurrent();
 

systemtray.cpp

@@ -26,7 +26,7 @@
 #include <kactionmenu.h>
 #include <ktoggleaction.h>
 
-#include <q3vbox.h>
+#include <kvbox.h>
 #include <QTimer>
 #include <QColor>
 #include <QPushButton>
@@ -320,9 +320,9 @@ void SystemTray::slotMouseInPopup()
 // private methods
 ////////////////////////////////////////////////////////////////////////////////
 
-Q3VBox *SystemTray::createPopupLayout(QWidget *parent, const FileHandle &file)
+KVBox *SystemTray::createPopupLayout(QWidget *parent, const FileHandle &file)
 {
-    Q3VBox *infoBox = 0;
+    KVBox *infoBox = 0;
 
     if(buttonsToLeft()) {
 
@@ -331,7 +331,7 @@ Q3VBox *SystemTray::createPopupLayout(QWidget *parent, const FileHandle &file)
         createButtonBox(parent);
         addSeparatorLine(parent);
 
-        infoBox = new Q3VBox(parent);
+        infoBox = new KVBox(parent);
 
         // Another line, and the cover, if there's a cover, and if
         // it's selected to be shown
@@ -350,7 +350,7 @@ Q3VBox *SystemTray::createPopupLayout(QWidget *parent, const FileHandle &file)
             addSeparatorLine(parent);
         }
 
-        infoBox = new Q3VBox(parent);
+        infoBox = new KVBox(parent);
 
         addSeparatorLine(parent);
         createButtonBox(parent);
@@ -387,10 +387,10 @@ void SystemTray::createPopup()
     connect(m_popup, SIGNAL(destroyed()), SLOT(slotPopupDestroyed()));
     connect(m_popup, SIGNAL(timeExpired()), SLOT(slotFadeOut()));
 
-    Q3HBox *box = new Q3HBox(m_popup, "popupMainLayout");
+    KHBox *box = new KHBox(m_popup);
     box->setSpacing(15); // Add space between text and buttons
 
-    Q3VBox *infoBox = createPopupLayout(box, playingFile);
+    KVBox *infoBox = createPopupLayout(box, playingFile);
 
     for(int i = 0; i < m_labels.capacity(); ++i) {
         m_labels[i] = new QLabel /*FlickerFreeLabel*/(" ", infoBox);
@@ -467,7 +467,7 @@ QPixmap SystemTray::createPixmap(const QString &pixName)
 
 void SystemTray::createButtonBox(QWidget *parent)
 {
-    Q3VBox *buttonBox = new Q3VBox(parent);
+    KVBox *buttonBox = new KVBox(parent);
 
     buttonBox->setSpacing(3);
 

systemtray.h

@@ -32,7 +32,7 @@
 
 class FlickerFreeLabel;
 class QTimer;
-class Q3VBox;
+class KVBox;
 class FileHandle;
 
 /**
@@ -98,7 +98,7 @@ private:
     // Creates the widget layout for the popup, returning the QVBox that
     // holds the text labels.  Uses buttonsToLeft() to figure out which
     // order to create them in.  @p file is used to grab the cover.
-    Q3VBox *createPopupLayout(QWidget *parent, const FileHandle &file);
+    KVBox *createPopupLayout(QWidget *parent, const FileHandle &file);
 
     void addSeparatorLine(QWidget *parent);
     void addCoverButton(QWidget *parent, const QPixmap &cover);