[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-21 14:55:08
Message-ID: 1203605708.360655.11746.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 777767 by mutz:

Clean up kdelibs 3.2 compat

 M  +1 -7      appearanceconfigpage.cpp  
 M  +4 -7      appearanceconfigpage.h  
 M  +4 -11     dirservconfigpage.cpp  
 M  +4 -7      dirservconfigpage.h  
 M  +1 -6      dnorderconfigpage.cpp  
 M  +1 -4      dnorderconfigpage.h  


--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigpage.cpp #777766:777767
@@ -46,7 +46,7 @@
   QVBoxLayout* lay = new QVBoxLayout( this );
   mWidget = new Kleo::AppearanceConfigWidget( this );
   lay->addWidget( mWidget );
-  connect( mWidget, SIGNAL( changed() ), this, SLOT( slotChanged() ) );
+  connect( mWidget, SIGNAL(changed()), this, SLOT(changed()) );
 
 #ifndef HAVE_UNBROKEN_KCMULTIDIALOG
   load();
@@ -81,10 +81,4 @@
   }
 }
 
-// kdelibs-3.2 didn't have the changed signal in KCModule...
-void AppearanceConfigurationPage::slotChanged()
-{
-  emit changed(true);
-}
-
 #include "appearanceconfigpage.moc"
--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigpage.h #777766:777767
@@ -44,15 +44,12 @@
 class AppearanceConfigurationPage : public KCModule {
   Q_OBJECT
 public:
-  AppearanceConfigurationPage( const KComponentData &instance, QWidget *parent=0, \
const QVariantList &args=QVariantList() ); +  explicit AppearanceConfigurationPage( \
const KComponentData &instance, QWidget *parent=0, const QVariantList \
&args=QVariantList() );  
-  virtual void load();
-  virtual void save();
-  virtual void defaults();
+  /* reimp */ void load();
+  /* reimp */ void save();
+  /* reimp */ void defaults();
 
-private slots:
-  void slotChanged();
-
 private:
   Kleo::AppearanceConfigWidget* mWidget;
 };
--- trunk/KDE/kdepim/kleopatra/conf/dirservconfigpage.cpp #777766:777767
@@ -150,7 +150,7 @@
                                                 \
Kleo::CryptoConfigEntry::ArgType_LDAPURL, true );  mWidget = new \
Kleo::DirectoryServicesWidget( entry, this );  lay->addWidget( mWidget );
-  connect( mWidget, SIGNAL( changed() ), this, SLOT( slotChanged() ) );
+  connect( mWidget, SIGNAL(changed()), this, SLOT(changed()) );
 
   // LDAP timeout
   KHBox* box = new KHBox( this );
@@ -159,7 +159,7 @@
   QLabel* label = new QLabel( i18n( "LDAP &timeout (minutes:seconds):" ), box );
   mTimeout = new QTimeEdit( box );
   mTimeout->setDisplayFormat( "mm:ss" );
-  connect( mTimeout, SIGNAL(timeChanged(const QTime&)), this, SLOT(slotChanged()) );
+  connect( mTimeout, SIGNAL(timeChanged(QTime)), this, SLOT(changed()) );
   label->setBuddy( mTimeout );
   QWidget* stretch = new QWidget( box );
   box->setStretchFactor( stretch, 2 );
@@ -171,13 +171,13 @@
   mMaxItems = new KIntNumInput( box );
   mMaxItems->setLabel( i18n( "&Maximum number of items returned by query:" ), \
Qt::AlignLeft | Qt::AlignVCenter );  mMaxItems->setMinimum( 0 );
-  connect( mMaxItems, SIGNAL( valueChanged(int) ), this, SLOT( slotChanged() ) );
+  connect( mMaxItems, SIGNAL(valueChanged(int)), this, SLOT(changed()) );
   stretch = new QWidget( box );
   box->setStretchFactor( stretch, 2 );
 
 #ifdef NOT_USEFUL_CURRENTLY
   mAddNewServersCB = new QCheckBox( i18n( "Automatically add &new servers discovered \
                in CRL distribution points" ), this );
-  connect( mAddNewServersCB, SIGNAL( clicked() ), this, SLOT( slotChanged() ) );
+  connect( mAddNewServersCB, SIGNAL(clicked()), this, SLOT(changed()) );
   lay->addWidget( mAddNewServersCB );
 #endif
 
@@ -272,13 +272,6 @@
   }
 }
 
-// kdelibs-3.2 didn't have the changed signal in KCModule...
-void DirectoryServicesConfigurationPage::slotChanged()
-{
-  emit changed(true);
-}
-
-
 // Find config entry for ldap servers. Implements runtime checks on the \
configuration option.  Kleo::CryptoConfigEntry* \
                DirectoryServicesConfigurationPage::configEntry( const char* \
                componentName,
                                                                           const \
                char* groupName,
--- trunk/KDE/kdepim/kleopatra/conf/dirservconfigpage.h #777766:777767
@@ -53,15 +53,12 @@
 class DirectoryServicesConfigurationPage : public KCModule {
   Q_OBJECT
 public:
-  DirectoryServicesConfigurationPage( const KComponentData &instance, QWidget \
*parent=0, const QVariantList &args=QVariantList() ); +  explicit \
DirectoryServicesConfigurationPage( const KComponentData &instance, QWidget \
*parent=0, const QVariantList &args=QVariantList() );  
-  virtual void load();
-  virtual void save();
-  virtual void defaults();
+  /* reimp */ void load();
+  /* reimp */ void save();
+  /* reimp */ void defaults();
 
-private slots:
-  void slotChanged();
-
 private:
   Kleo::CryptoConfigEntry* configEntry( const char* componentName,
                                         const char* groupName,
--- trunk/KDE/kdepim/kleopatra/conf/dnorderconfigpage.cpp #777766:777767
@@ -49,7 +49,7 @@
   mWidget->setObjectName( "mWidget" );
   vlay->addWidget( mWidget );
 
-  connect( mWidget, SIGNAL(changed()), SLOT(slotChanged()) );
+  connect( mWidget, SIGNAL(changed()), SLOT(changed()) );
 
 #ifndef HAVE_UNBROKEN_KCMULTIDIALOG
   load();
@@ -69,11 +69,6 @@
   mWidget->defaults();
 }
 
-// kdelibs-3.2 didn't have the changed signal in KCModule...
-void DNOrderConfigPage::slotChanged() {
-  emit changed(true);
-}
-
 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" );
--- trunk/KDE/kdepim/kleopatra/conf/dnorderconfigpage.h #777766:777767
@@ -44,7 +44,7 @@
 class DNOrderConfigPage : public KCModule {
   Q_OBJECT
 public:
-  DNOrderConfigPage( const KComponentData &instance, QWidget *parent=0, const \
QVariantList &args=QVariantList() ); +  explicit DNOrderConfigPage( const \
KComponentData &instance, QWidget *parent=0, const QVariantList &args=QVariantList() \
);  
   /*! reimplementation */
   void load();
@@ -53,9 +53,6 @@
   /*! reimplementation */
   void defaults();
 
-private Q_SLOTS:
-  void slotChanged();
-
 private:
   Kleo::DNAttributeOrderConfigWidget * mWidget;
 };


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