initial public commit of qt4 portp1

1 files changed, 19 insertions, 14 deletions

diff --git a/microkde/keditlistbox.cpp b/microkde/keditlistbox.cpp
index 55b7784..257a44a 100644
--- a/microkde/keditlistbox.cpp
+++ b/microkde/keditlistbox.cpp
@@ -20,12 +20,15 @@
 
 #include <qstringlist.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qgroupbox.h>
-#include <qlistbox.h>
-#include <qwhatsthis.h>
+#include <q3groupbox.h>
+#include <q3listbox.h>
+#include <q3whatsthis.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3StrList>
 
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -46,24 +49,24 @@ public:
 };
 
 KEditListBox::KEditListBox(QWidget *parent, const char *name,
 			   bool checkAtEntering, int buttons )
-    :QGroupBox(parent, name )
+    :Q3GroupBox(parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 KEditListBox::KEditListBox(const QString& title, QWidget *parent,
 			   const char *name, bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :Q3GroupBox(title, parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 KEditListBox::KEditListBox(const QString& title, const CustomEditor& custom,
                            QWidget *parent, const char *name,
                            bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :Q3GroupBox(title, parent, name )
 {
     m_lineEdit = custom.lineEdit();
     init( checkAtEntering, buttons, custom.representationWidget() );
 }
@@ -94,9 +97,9 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
                               QSizePolicy::MinimumExpanding));
 
     QWidget * gb = this;
-    QGridLayout * grid = new QGridLayout(gb, 7 - lostButtons, 2,
+    Q3GridLayout * grid = new Q3GridLayout(gb, 7 - lostButtons, 2,
                                          KDialog::marginHint(),
                                          KDialog::spacingHint());
     grid->addRowSpacing(0, fontMetrics().lineSpacing());
     for ( int i = 1; i < 7 - lostButtons; i++ )
@@ -108,9 +111,9 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
         representationWidget->reparent( gb, QPoint(0,0) );
     else
         m_lineEdit=new KLineEdit(gb);
 
-    m_listBox = new QListBox(gb);
+    m_listBox = new Q3ListBox(gb);
 
     QWidget *editingWidget = representationWidget ?
                              representationWidget : m_lineEdit;
     grid->addMultiCellWidget(editingWidget,1,1,0,1);
@@ -203,9 +206,9 @@ void KEditListBox::moveItemUp()
         KNotifyClient::beep();
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    Q3ListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex-1);
     m_listBox->setCurrentItem(selIndex - 1);
 
@@ -226,9 +229,9 @@ void KEditListBox::moveItemDown()
         KNotifyClient::beep();
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    Q3ListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex+1);
     m_listBox->setCurrentItem(selIndex + 1);
 
@@ -348,16 +351,18 @@ void KEditListBox::insertStringList(const QStringList& list, int index)
 {
     m_listBox->insertStringList(list,index);
 }
 
-void KEditListBox::insertStrList(const QStrList* list, int index)
+void KEditListBox::insertStrList(const Q3StrList* list, int index)
 {
-    m_listBox->insertStrList(list,index);
+    for(Q3StrList::const_iterator i=list->begin();i!=list->end();++i)
+	m_listBox->insertItem(*i,index++);
 }
 
-void KEditListBox::insertStrList(const QStrList& list, int index)
+void KEditListBox::insertStrList(const Q3StrList& list, int index)
 {
-    m_listBox->insertStrList(list,index);
+    for(Q3StrList::const_iterator i=list.begin();i!=list.end();++i)
+	m_listBox->insertItem(*i,index++);
 }
 
 void KEditListBox::insertStrList(const char ** list, int numStrings, int index)
 {