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

List:       kde-commits
Subject:    KDE/kdepim/kresources/groupwise
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-10-27 20:31:56
Message-ID: 1130445116.720493.11818.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 474985 by coolo:

some porting


 M  +3 -3      groupwisesettingswidget.cpp  
 M  +2 -2      groupwisesettingswidget.h  
 M  +1 -1      kabc_resourcegroupwise.cpp  
 M  +10 -7     kabc_resourcegroupwiseconfig.cpp  
 M  +1 -1      kabc_resourcegroupwiseconfig.h  
 M  +1 -1      kcal_resourcegroupwise.cpp  
 M  +5 -3      kcal_resourcegroupwiseconfig.cpp  
 M  +1 -1      kcal_resourcegroupwiseconfig.h  
 M  +4 -4      kioslave/groupwise.cpp  


--- trunk/KDE/kdepim/kresources/groupwise/groupwisesettingswidget.cpp #474984:474985
@@ -27,11 +27,11 @@
 GroupWiseSettingsWidget::GroupWiseSettingsWidget( QWidget * parent )
 : GroupWiseSettingsWidgetBase( parent )
 {
-  connect( m_settingsList, SIGNAL( itemRenamed( QListViewItem *, int ) ),
-          this, SLOT( slotItemRenamed( QListViewItem *, int ) ) );
+  connect( m_settingsList, SIGNAL( itemRenamed( Q3ListViewItem *, int ) ),
+          this, SLOT( slotItemRenamed( Q3ListViewItem *, int ) ) );
 }
 
-void GroupWiseSettingsWidget::slotItemRenamed( QListViewItem * item, int )
+void GroupWiseSettingsWidget::slotItemRenamed( Q3ListViewItem * item, int )
 {
   kdDebug() << "GroupWiseSettingsWidget::slotItemRenamed() - " << item->text( 1 ) << \
" changed to " << item->text( 2 ) << endl;  m_dirtySettings.insert( item->text( 1 ), \
                item->text( 2 ) );
--- trunk/KDE/kdepim/kresources/groupwise/groupwisesettingswidget.h #474984:474985
@@ -24,7 +24,7 @@
 
 #include <qmap.h>
 
-class QListViewItem;
+class Q3ListViewItem;
 
 #include "groupwisesettingswidgetbase.h"
 
@@ -39,7 +39,7 @@
   /**
    * Add the renamed item to the list of dirty (changed) settings
    */
-  void slotItemRenamed( QListViewItem *Item, int ColumnRenamed );
+  void slotItemRenamed( Q3ListViewItem *Item, int ColumnRenamed );
 private: 
   QMap<QString, QString> m_dirtySettings;
 };
--- trunk/KDE/kdepim/kresources/groupwise/kabc_resourcegroupwise.cpp #474984:474985
@@ -135,7 +135,7 @@
 
   mAddressBooks.clear();
 
-  for( uint i = 0; i < ids.count(); ++i ) {
+  for( int i = 0; i < ids.count(); ++i ) {
     GroupWise::AddressBook ab;
     ab.id = ids[ i ];
     ab.name = names[ i ];
--- trunk/KDE/kdepim/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp \
#474984:474985 @@ -33,14 +33,17 @@
 
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3Frame>
+#include <QGridLayout>
 
 using namespace KABC;
 
-class AddressBookItem : public QCheckListItem
+class AddressBookItem : public Q3CheckListItem
 {
   public:
     AddressBookItem( KListView *parent, GroupWise::AddressBook ab )
-      : QCheckListItem( parent, "", CheckBox ),
+      : Q3CheckListItem( parent, "", CheckBox ),
         mId( ab.id )
     {
       setText( 0, ab.name );
@@ -56,8 +59,8 @@
     QString mId;
 };
 
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent,  const char* name \
                )
-  : KRES::ConfigWidget( parent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent )
+  : KRES::ConfigWidget( parent )
 {
   QGridLayout *mainLayout = new QGridLayout( this, 7, 2, 0, KDialog::spacingHint() \
);  
@@ -80,8 +83,8 @@
   mainLayout->addWidget( label, 2, 0 );
   mainLayout->addWidget( mPassword, 2, 1 );
 
-  QFrame *hline = new QFrame( this );
-  hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+  Q3Frame *hline = new Q3Frame( this );
+  hline->setFrameStyle( Q3Frame::HLine | Q3Frame::Sunken );
 
   mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
 
@@ -156,7 +159,7 @@
   QStringList selectedRead;
   QString selectedWrite;
 
-  QListViewItemIterator it2( mAddressBookView );
+  Q3ListViewItemIterator it2( mAddressBookView );
   while ( it2.current() ) {
     AddressBookItem *item = static_cast<AddressBookItem*>( it2.current() );
     if ( item->isOn() )
--- trunk/KDE/kdepim/kresources/groupwise/kabc_resourcegroupwiseconfig.h \
#474984:474985 @@ -41,7 +41,7 @@
   Q_OBJECT
 
   public:
-    ResourceGroupwiseConfig( QWidget* parent = 0, const char* name = 0 );
+    ResourceGroupwiseConfig( QWidget* parent );
 
   public slots:
     void loadSettings( KRES::Resource* );
--- trunk/KDE/kdepim/kresources/groupwise/kcal_resourcegroupwise.cpp #474984:474985
@@ -32,7 +32,7 @@
 
 #include <qapplication.h>
 #include <qdatetime.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 
--- trunk/KDE/kdepim/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp \
#474984:474985 @@ -23,6 +23,8 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
+//Added by qt3to4:
+#include <QGridLayout>
 
 #include <klocale.h>
 #include <klistview.h>
@@ -41,8 +43,8 @@
 
 using namespace KCal;
 
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent,  const char* name \
                )
-    : KRES::ConfigWidget( parent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent )
+    : KRES::ConfigWidget( parent )
 {
   resize( 245, 115 ); 
   QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
@@ -122,7 +124,7 @@
 
     if ( s )
     {
-      KDialogBase * dialog = new KDialogBase( ::qt_cast<QWidget*>(parent() ), \
"gwsettingswidget", true, i18n( "GroupWise Settings" ) ); +      KDialogBase * dialog \
= new KDialogBase( qobject_cast<QWidget*>(parent() ), "gwsettingswidget", true, i18n( \
"GroupWise Settings" ) );  //       QVBoxLayout * layout = new QVBoxLayout( dialog );
       GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog \
);  dialog->setMainWidget( settingsWidget );
--- trunk/KDE/kdepim/kresources/groupwise/kcal_resourcegroupwiseconfig.h \
#474984:474985 @@ -43,7 +43,7 @@
 { 
     Q_OBJECT
   public:
-    ResourceGroupwiseConfig( QWidget *parent = 0, const char *name = 0 );
+    ResourceGroupwiseConfig( QWidget *parent );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource );
--- trunk/KDE/kdepim/kresources/groupwise/kioslave/groupwise.cpp #474984:474985
@@ -97,7 +97,7 @@
   kdDebug(7000) << " Path: " << url.path() << endl;
   kdDebug(7000) << " Query: " << url.query() << endl;
   kdDebug(7000) << " Protocol: " << url.protocol() << endl;
-  kdDebug(7000) << " Filename: " << url.filename() << endl;
+  kdDebug(7000) << " Filename: " << url.fileName() << endl;
   #endif
 
   mimeType( "text/plain" );
@@ -159,7 +159,7 @@
 
 void Groupwise::getFreeBusy( const KURL &url )
 {
-  QString file = url.filename();
+  QString file = url.fileName();
   if ( file.right( 4 ) != ".ifb" ) {
     QString error = i18n("Illegal filename. File has to have '.ifb' suffix.");
     errorMessage( error );
@@ -187,8 +187,8 @@
       QDate start = QDate::currentDate().addDays( -3 );
       QDate end = QDate::currentDate().addDays( 60 );
 
-      fb->setDtStart( start );
-      fb->setDtEnd( end );
+      fb->setDtStart( QDateTime( start ) );
+      fb->setDtEnd( QDateTime( end ) );
 
       kdDebug() << "Login" << endl;
 


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