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

List:       kde-commits
Subject:    KDE/kdepim
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2006-02-06 17:42:11
Message-ID: 1139247731.091203.25455.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 506392 by vkrause:

Compile with new kdelibs snapshot.


 M  +1 -1      akregator/src/pluginmanager.cpp  
 M  +3 -2      karm/mainwindow.cpp  
 M  +1 -1      kmailcvt/Makefile.am  
 M  +4 -4      kmailcvt/kmailcvt.cpp  
 M  +2 -2      kmailcvt/kmailcvt.h  


--- trunk/KDE/kdepim/akregator/src/pluginmanager.cpp #506391:506392
@@ -140,7 +140,7 @@
 {
     if ( !plugin ) {
         kdWarning() << k_funcinfo << "pointer == NULL\n";
-        return 0;
+        return KService::Ptr( 0 );
     }
 
     //search plugin in store
--- trunk/KDE/kdepim/karm/mainwindow.cpp #506391:506392
@@ -203,8 +203,9 @@
 
 void MainWindow::startStatusBar()
 {
-  statusBar()->insertItem( i18n("Session"), 0, 0, true );
-  statusBar()->insertItem( i18n("Total" ), 1, 0, true );
+#warning KStatusBar lost support for permanent items
+  statusBar()->insertItem( i18n("Session"), 0, 0/*, true*/ );
+  statusBar()->insertItem( i18n("Total" ), 1, 0/*, true*/ );
 }
 
 void MainWindow::saveProperties( KConfig* cfg )
--- trunk/KDE/kdepim/kmailcvt/Makefile.am #506391:506392
@@ -8,7 +8,7 @@
                    filter_kmail_maildir.cxx filter_sylpheed.cxx filter_thebat.cxx \
                    filter_lnotes.cxx
                 
-kmailcvt_LDADD   = $(LIB_KFILE)
+kmailcvt_LDADD   = $(LIB_KFILE) $(LIB_KDE3SUPPORT)
 
 EXTRA_DIST = main.cpp kmailcvt.cpp kimportpage.cpp kimportpage.h \
              kselfilterpage.cpp kselfilterpage.h kmailcvt.h \
--- trunk/KDE/kdepim/kmailcvt/kmailcvt.cpp #506391:506392
@@ -22,7 +22,7 @@
 #include "filters.hxx"
 
 KMailCVT::KMailCVT(QWidget *parent, const char *name)
-	: KWizard(parent, name, true) {
+	: K3Wizard(parent, name, true) {
 
 	setCaption( i18n( "KMailCVT Import Tool" ) );
 
@@ -45,7 +45,7 @@
 		if (!selectedFilter)
 			return;
 		// Goto next page
-		KWizard::next();
+		K3Wizard::next();
 		// Disable back & finish
 		setBackEnabled( currentPage(), false );
 		setFinishEnabled( currentPage(), false );
@@ -60,12 +60,12 @@
 		// Enable finish & back buttons
 		setFinishEnabled( currentPage(), true );
 		setBackEnabled( currentPage(), true );
-	} else KWizard::next();
+	} else K3Wizard::next();
 }
 
 void KMailCVT::reject() {
 	if ( currentPage() == importpage && ! finishButton()->isEnabled() ) \
                FilterInfo::terminateASAP(); // ie. import in progress
-	else KWizard::reject();
+	else K3Wizard::reject();
 }
 
 void KMailCVT::help()
--- trunk/KDE/kdepim/kmailcvt/kmailcvt.h #506391:506392
@@ -19,13 +19,13 @@
 #endif
 
 #include <kapplication.h>
-#include <kwizard.h>
+#include <k3wizard.h>
 
 #include "kimportpage.h"
 #include "kselfilterpage.h"
   
 /** KMailCVT is the base class of the project */
-class KMailCVT : public KWizard {
+class KMailCVT : public K3Wizard {
 	Q_OBJECT
 public:
 	KMailCVT(QWidget* parent=0, const char *name=0);


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