initial public commit of qt4 portp1

1 files changed, 27 insertions, 24 deletions

diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 671787e..bda1b9e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -11,44 +11,47 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
 
 #include "addresseedialog.h"
 #include "KDGanttMinimizeSplitter.h"
 //#include "addresseedialog.moc"
 
 using namespace KABC;
 
-AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
-  QListViewItem( parent ),
+AddresseeItem::AddresseeItem( Q3ListView *parent, const Addressee &addressee ) :
+  Q3ListViewItem( parent ),
   mAddressee( addressee )
 {
     setText( Name,addressee.realName());
     setText( Email, addressee.preferredEmail() );
     setText( Category, addressee.categories().join(";") );
 }
 
 QString AddresseeItem::key( int column, bool ) const
 {
 
   if (column == Email) {
     QString value = text(Email);
@@ -62,80 +65,80 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, No, parent ), mMultiple( multiple )
 {
     qDebug("NEW AddresseeDialog ");
     
 
   KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this );
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   setMainWidget( mMiniSplitter );
 
   QWidget *listWidget = new QWidget( mMiniSplitter );
 
-  QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+  Q3VBoxLayout *listLayout = new Q3VBoxLayout (listWidget) ;
   //topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( listWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->addColumn( i18n("Category") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
-  connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
+  connect( mAddresseeList, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
            SLOT( slotOk() ) );
   //QHBox* searchBox = new QHBox ( listWidget );
-  QHBox * hb = new QHBox ( listWidget );
+  Q3HBox * hb = new Q3HBox ( listWidget );
   listLayout->addWidget (  hb );
   mAddresseeEdit = new QLineEdit(  hb );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
   QPushButton *searchButton = new QPushButton( i18n("Search!"),   hb ); 
   connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) );
    if ( mMultiple ) {
      
     mSelectedList = new KListView( mMiniSplitter );
     mSelectedList->addColumn( i18n("Selected Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     //connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
     //       SLOT( removeSelected() ) );
-    connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ),
+    connect( mSelectedList, SIGNAL( clicked( Q3ListViewItem * ) ),
              SLOT( removeSelected() ) );
-    connect( mSelectedList, SIGNAL( returnPressed( QListViewItem *) ),
+    connect( mSelectedList, SIGNAL( returnPressed( Q3ListViewItem *) ),
              SLOT( removeSelected() ) );
 
 #if 0
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
 #endif
-    connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
-             SLOT( addSelected( QListViewItem * ) ) );
-    connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
-             SLOT( selectNextItem( QListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( clicked( Q3ListViewItem * ) ),
+             SLOT( addSelected( Q3ListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( returnPressed( Q3ListViewItem * ) ),
+             SLOT( selectNextItem( Q3ListViewItem * ) ) );
 
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
 #if 0
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 #endif
   loadAddressBook();  
-  QValueList<int> splitterSize; 
+  Q3ValueList<int> splitterSize; 
   splitterSize.append( ( width() / 5 ) * 3 );
   splitterSize.append( ( width() / 5 ) *2 );
   mMiniSplitter->setSizes( splitterSize );
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
     qDebug("DELETE AddresseeDialog ");
 }
 
 void AddresseeDialog::loadAddressBook()
 {
@@ -163,82 +166,82 @@ void AddresseeDialog::loadAddressBook()
       QString name = (*it).realName();
       name += (*it).preferredEmail();
       name += (*it).categories().join(";");
 #if QT_VERSION >= 0x030000
       if (re.search(name) != -1)
 #else
       if (re.match(name) != -1)
 #endif
           AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
   }
 }
 
-void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
+void AddresseeDialog::addCompletionItem( const QString &str, Q3ListViewItem *item )
 {
   if ( str.isEmpty() ) return;
 
   mItemDict.insert( str, item );
   //mAddresseeEdit->completionObject()->addItem( str );
 }
 
 void AddresseeDialog::selectItem( const QString &str )
 {
   if ( str.isEmpty() ) return;
 
-  QListViewItem *item = mItemDict.find( str );
+  Q3ListViewItem *item = mItemDict.find( str );
   if ( item ) {
     mAddresseeList->blockSignals( true );
     mAddresseeList->setSelected( item, true );
     mAddresseeList->ensureItemVisible( item );
     mAddresseeList->blockSignals( false );
   }
 }
 
-void AddresseeDialog::updateEdit( QListViewItem *item )
+void AddresseeDialog::updateEdit( Q3ListViewItem *item )
 {
   mAddresseeEdit->setText( item->text( 0 ) );
   mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
 }
 
-void AddresseeDialog::selectNextItem( QListViewItem *item )
+void AddresseeDialog::selectNextItem( Q3ListViewItem *item )
 {
     addSelected( item );
-    QListViewItem *next = item->nextSibling();
+    Q3ListViewItem *next = item->nextSibling();
     if ( next ) {
         next->setSelected( true );
         item->setSelected( false );
         mAddresseeList->setCurrentItem( next );
     }
 }
-void AddresseeDialog::addSelected( QListViewItem *item )
+void AddresseeDialog::addSelected( Q3ListViewItem *item )
 {
     AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
 
   Addressee a = addrItem->addressee();
 
-  QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
+  Q3ListViewItem *selectedItem = mSelectedDict.find( a.uid() );
   if ( !selectedItem ) {
     selectedItem = new AddresseeItem( mSelectedList, a );
     mSelectedDict.insert( a.uid(), selectedItem );
   }
  
 }
 
 void AddresseeDialog::removeSelected()
 {
-  QListViewItem *item = mSelectedList->selectedItem();
+  Q3ListViewItem *item = mSelectedList->selectedItem();
   AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
-  QListViewItem *next =  item->nextSibling();
+  Q3ListViewItem *next =  item->nextSibling();
   mSelectedDict.remove( addrItem->addressee().uid() );
   delete addrItem;
   if ( next )
       next->setSelected( true );
 }
 
 Addressee AddresseeDialog::addressee()
 {
   AddresseeItem *aItem = 0;
   
   if ( mMultiple )
       aItem = (AddresseeItem *)( mSelectedList->firstChild() );
@@ -246,25 +249,25 @@ Addressee AddresseeDialog::addressee()
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
  
   if (aItem) return aItem->addressee();
   return Addressee();
 }
 
 Addressee::List AddresseeDialog::addressees()
 {
   Addressee::List al;
   AddresseeItem *aItem = 0;
 
   if ( mMultiple ) {
-    QListViewItem *item = mSelectedList->firstChild();
+    Q3ListViewItem *item = mSelectedList->firstChild();
     while( item ) {
         aItem = (AddresseeItem *)( item );
       if ( aItem ) al.append( aItem->addressee() );
       item = item->nextSibling();
     }
   }
   else
   {
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
     if (aItem) al.append( aItem->addressee() );
   }