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

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

SVN commit 777412 by mutz:

Re-add DNAttibuteOrderConfigWidget for ONLY_KLEO

 M  +4 -4      CMakeLists.txt  
 M  +4 -11     kleo/dn.cpp  
 M  +1 -1      kleo/dn.h  
 M  +6 -8      ui/dnattributeorderconfigwidget.cpp  
 M  +3 -1      ui/dnattributeorderconfigwidget.h  


--- trunk/KDE/kdepim/libkleo/CMakeLists.txt #777411:777412
@@ -2,11 +2,11 @@
 
 if ( NOT ONLY_KLEO )
   add_definitions( -DKLEO_BUILD_OLD_MAINWINDOW )
-  add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 else ( NOT ONLY_KLEO )
   add_definitions( -DONLY_KLEO )
 endif ( NOT ONLY_KLEO )
 
+add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS )
 add_definitions( ${KDE4_ENABLE_EXCEPTIONS} )
 
 add_subdirectory( pics )
@@ -66,7 +66,6 @@
    ui/keyrequester.cpp
    ui/keyapprovaldialog.cpp
    ui/backendconfigwidget.cpp
-   ui/dnattributeorderconfigwidget.cpp
 )
 set(libkleo_ui_common_SRCS
    ui/kdhorizontalline.cpp
@@ -77,6 +76,7 @@
    ui/cryptoconfigdialog.cpp
    ui/directoryserviceswidget.cpp
    ui/adddirectoryservicedialogimpl.cpp
+   ui/dnattributeorderconfigwidget.cpp
 )
 
 set(libkleo_compat_SRCS # make this a separate lib.
@@ -91,10 +91,10 @@
 )
 
 set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} \
                ${libkleo_backend_qgpgme_SRCS})
-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
 if ( NOT ONLY_KLEO )
    set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} \
                ${libkleo_backend_chiasmus_SRCS} )
-   set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} \
${QT_QT3SUPPORT_LIBRARY} ) +   set( kleo_LIB_LIBS ${kleo_LIB_LIBS} \
${KDE4_KDE3SUPPORT_LIBS} )  if ( NOT KLEO_NO_COMPAT )
      set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_compat_SRCS} )
    endif ( NOT KLEO_NO_COMPAT )
--- trunk/KDE/kdepim/libkleo/kleo/dn.cpp #777411:777412
@@ -37,10 +37,9 @@
 #include "dn.h"
 
 #include "oidmap.h"
-#ifdef KLEO_BUILD_OLD_MAINWINDOW
-# include "libkleo/ui/dnattributeorderconfigwidget.h"
-#endif
 
+#include "libkleo/ui/dnattributeorderconfigwidget.h"
+
 #include <kconfig.h>
 #include <klocale.h>
 
@@ -510,12 +509,6 @@
   config.writeEntry( "AttributeOrder", order );
 }
 
-Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( QWidget \
                * parent, const char * name ) const {
-#ifdef KLEO_BUILD_OLD_MAINWINDOW
-  return new DNAttributeOrderConfigWidget( mSelf, parent, name );
-#else
-  Q_UNUSED( parent );
-  Q_UNUSED( name );
-  return 0;
-#endif
+Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( QWidget \
* parent ) const { +  return new DNAttributeOrderConfigWidget( mSelf, parent );
 }
--- trunk/KDE/kdepim/libkleo/kleo/dn.h #777411:777412
@@ -63,7 +63,7 @@
 
     void setAttributeOrder( const QStringList & order );
 
-    DNAttributeOrderConfigWidget * configWidget( QWidget * parent=0, const char * \
name=0 ) const; +    DNAttributeOrderConfigWidget * configWidget( QWidget * parent=0 \
) const;  
   private:
     class Private;
--- trunk/KDE/kdepim/libkleo/ui/dnattributeorderconfigwidget.cpp #777411:777412
@@ -41,16 +41,15 @@
 #include <kconfig.h>
 
 #include <QToolButton>
+#include <QGridLayout>
 #include <QLayout>
-#include <q3header.h>
 #include <QLabel>
+
 #include <q3listview.h>
+#include <q3header.h>
 
-//Added by qt3to4:
-#include <QGridLayout>
+#include <cassert>
 
-#include <assert.h>
-
 class Kleo::DNAttributeOrderConfigWidget::Private {
 public:
   enum { UUp=0, Up=1, Left=2, Right=3, Down=4, DDown=5 };
@@ -72,10 +71,9 @@
   lv->addColumn( i18n("Description") );
 }
 
-Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper \
                * mapper, QWidget * parent, const char * name, Qt::WFlags f )
-  : QWidget( parent, f ), d( new Private() )
+Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper \
* mapper, QWidget * parent, Qt::WindowFlags f ) +  : QWidget( parent, f ), d( new \
Private )  {
-  setObjectName(name);
   assert( mapper );
   d->mapper = mapper;
 
--- trunk/KDE/kdepim/libkleo/ui/dnattributeorderconfigwidget.h #777411:777412
@@ -34,7 +34,9 @@
 #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__
 
 #include "kleo/kleo_export.h"
+
 #include <QtGui/QWidget>
+
 namespace Kleo {
   class DNAttributeMapper;
 }
@@ -47,7 +49,7 @@
     Q_OBJECT
   public:
     /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) \
                instead. */
-    explicit DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, QWidget * \
parent=0, const char * name=0, Qt::WFlags f=0 ); +    explicit \
DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, QWidget * parent=0, \
Qt::WindowFlags f=0 );  ~DNAttributeOrderConfigWidget();
 
     void load();


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