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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/conf
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-02-20 14:03:47
Message-ID: 1203516227.418627.15756.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 777411 by mutz:

Complete half-way port to KDE4

 M  +5 -3      dnorderconfigpage.cpp  
 M  +4 -4      dnorderconfigpage.h  


--- trunk/KDE/kdepim/kleopatra/conf/dnorderconfigpage.cpp #777410:777411
@@ -35,16 +35,18 @@
 
 #include "libkleo/ui/dnattributeorderconfigwidget.h"
 #include "libkleo/kleo/dn.h"
+
 #include <kcomponentdata.h>
 
 #include <QLayout>
 #include <QVBoxLayout>
 
-DNOrderConfigPage::DNOrderConfigPage( const KComponentData &instance, QWidget \
*parent, const QStringList &args ) +DNOrderConfigPage::DNOrderConfigPage( const \
KComponentData &instance, QWidget *parent, const QVariantList &args )  : KCModule( \
instance, parent, args )  {
   QVBoxLayout * vlay = new QVBoxLayout( this );
-  mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" );
+  mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this );
+  mWidget->setObjectName( "mWidget" );
   vlay->addWidget( mWidget );
 
   connect( mWidget, SIGNAL(changed()), SLOT(slotChanged()) );
@@ -72,7 +74,7 @@
   emit changed(true);
 }
 
-extern "C" KDE_EXPORT KCModule * create_kleopatra_config_dnorder( QWidget *parent=0, \
const QStringList &args=QStringList() ) { +extern "C" KDE_EXPORT KCModule * \
                create_kleopatra_config_dnorder( QWidget * parent, const QVariantList \
                & args ) {
     DNOrderConfigPage *page = new DNOrderConfigPage( KComponentData( "kleopatra" ), \
parent, args );  page->setObjectName( "kleopatra_config_dnorder" );
     return page;
--- trunk/KDE/kdepim/kleopatra/conf/dnorderconfigpage.h #777410:777411
@@ -31,9 +31,9 @@
 
 #ifndef __KLEOPATRA_CONF_DNORDERCONFIGPAGE_H__
 #define __KLEOPATRA_CONF_DNORDERCONFIGPAGE_H__
-#define KDE3_SUPPORT
+
 #include <kcmodule.h>
-#undef KDE3_SUPPORT
+
 namespace Kleo {
   class DNAttributeOrderConfigWidget;
 }
@@ -44,7 +44,7 @@
 class DNOrderConfigPage : public KCModule {
   Q_OBJECT
 public:
-  DNOrderConfigPage( const KComponentData &instance, QWidget *parent=0, const \
QStringList &args=QStringList() ); +  DNOrderConfigPage( const KComponentData \
&instance, QWidget *parent=0, const QVariantList &args=QVariantList() );  
   /*! reimplementation */
   void load();
@@ -53,7 +53,7 @@
   /*! reimplementation */
   void defaults();
 
-private slots:
+private Q_SLOTS:
   void slotChanged();
 
 private:


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