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

List:       kde-commits
Subject:    KDE/kdepim/kode
From:       Josef Spillner <spillner () kde ! org>
Date:       2006-07-20 12:42:26
Message-ID: 1153399346.145002.12286.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 564536 by josef:

- make it compile! (but some FIXMEs were added)
- warn about potential qmake segfault, don't know why it happens



 M  +2 -2      kwsdl/CMakeLists.txt  
 M  +4 -3      kwsdl/kung/binaryinputfield.cpp  
 M  +2 -1      kwsdl/kung/complexbaseinputfield.cpp  
 M  +2 -2      kwsdl/kung/enuminputfield.cpp  
 M  +1 -1      kwsdl/kung/inputdialog.cpp  
 M  +1 -1      kwsdl/kung/inputfield.cpp  
 M  +1 -1      kwsdl/kung/pageinputfield.cpp  
 M  +2 -2      kxforms/kxforms.pro  


--- trunk/KDE/kdepim/kode/kwsdl/CMakeLists.txt #564535:564536
@@ -1,8 +1,8 @@
 
 add_subdirectory( doc ) 
 add_subdirectory( wsdl ) 
-#add_subdirectory( wscl ) 
-#add_subdirectory( kung ) 
+add_subdirectory( wscl ) 
+add_subdirectory( kung ) 
 
 include_directories( ${CMAKE_SOURCE_DIR}/kode  )
 
--- trunk/KDE/kdepim/kode/kwsdl/kung/binaryinputfield.cpp #564535:564536
@@ -127,7 +127,8 @@
     mimetype = result->mimeType();
 
   if ( !mimetype.isEmpty() ) {
-    KParts::ReadOnlyPart *part = \
KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( \
mimetype, QString::null, this, 0, this, 0 ); +    KParts::ReadOnlyPart *part = 0;
+    //KParts::ReadOnlyPart *part = \
KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( \
mimetype, QString::null, this, 0, this, 0 ); // FIXME: doesn't work  if ( part ) {
       KTempFile file;
       file.file()->write( data );
@@ -150,7 +151,7 @@
 
 void BinaryWidget::load()
 {
-  KUrl url = KFileDialog::getOpenURL( QString(), QString(), this );
+  KUrl url = KFileDialog::getOpenUrl( QString(), QString(), this );
   if ( url.isEmpty() )
     return;
 
@@ -175,7 +176,7 @@
 
 void BinaryWidget::save()
 {
-  KUrl url = KFileDialog::getSaveURL( QString(), QString(), this );
+  KUrl url = KFileDialog::getSaveUrl( QString(), QString(), this );
   if ( url.isEmpty() )
     return;
 
--- trunk/KDE/kdepim/kode/kwsdl/kung/complexbaseinputfield.cpp #564535:564536
@@ -144,7 +144,8 @@
   QGroupBox *inputWidget = new QGroupBox( mName, parent );
 #warning Is this needed?
   //inputWidget->setColumnLayout( 0, Qt::Horizontal );
-  QGridLayout *layout = new QGridLayout( inputWidget->layout() );
+  QGridLayout *layout = new QGridLayout( inputWidget );
+  //QGridLayout *layout = new QGridLayout( inputWidget->layout() ); // FIXME: \
doesn't work  layout->setSpacing( 6 );
 
   InputField::List::Iterator it;
--- trunk/KDE/kdepim/kode/kwsdl/kung/enuminputfield.cpp #564535:564536
@@ -68,8 +68,8 @@
 {
   mInputWidget = new KComboBox( parent );
 
-  mInputWidget->insertStringList( mEnums );
-  mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) );
+  mInputWidget->addItems( mEnums );
+  mInputWidget->setCurrentItem( mEnums.indexOf( mValue ) );
 
   connect( mInputWidget, SIGNAL( activated( int ) ),
            this, SLOT( inputChanged( int ) ) );
--- trunk/KDE/kdepim/kode/kwsdl/kung/inputdialog.cpp #564535:564536
@@ -26,7 +26,7 @@
 InputDialog::InputDialog( QWidget *page, QWidget *parent )
   : KDialog( parent)
 {
-  setbuttons(Ok | Cancel);
+  setButtons(Ok | Cancel);
   setDefaultButton(Ok);
   setModal(true);
   showButtonSeparator(true);
--- trunk/KDE/kdepim/kode/kwsdl/kung/inputfield.cpp #564535:564536
@@ -52,7 +52,7 @@
 
 void InputField::removeChild( InputField *field )
 {
-  mFields.remove( field );
+  mFields.removeAll( field );
 }
 
 InputField *InputField::childField( const QString &name ) const
--- trunk/KDE/kdepim/kode/kwsdl/kung/pageinputfield.cpp #564535:564536
@@ -88,7 +88,7 @@
 
 QWidget *PageInputField::createWidget( QWidget *parent )
 {
-  QWidget *mInputWidget = new QWidget( parent, "PageInputWidget" );
+  QWidget *mInputWidget = new QWidget( parent );
   QGridLayout *layout = new QGridLayout( mInputWidget );
   layout->setSpacing( 6 );
   layout->setMargin( 11 );
--- trunk/KDE/kdepim/kode/kxforms/kxforms.pro #564535:564536
@@ -53,8 +53,8 @@
 QT += xml
 
 LIBS += -L../kxml_compiler -lkschema
-LIBS += -L../schema -lschema
-LIBS += -L../common -lkxmlcommon
+LIBS += -L../schema -lschema                  # warning qmake may crash if not \
present! +LIBS += -L../common -lkxmlcommon              # warning qmake may crash if \
not present!  LIBS += -L../compat -lcompat
 
 DUMMY_MOCS = formgui.moc guihandlerdialogs.moc guihandlerflat.moc \


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