[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 553011 by mlaurent:

Adapt to new kdelibs api


 M  +2 -1      CMakeLists.txt  
 M  +3 -3      cervisia/logdlg.cpp  
 M  +3 -3      kbugbuster/gui/packageselectdialog.cpp  
 M  +0 -1      kcachegrind/kcachegrind/toplevel.h  
 M  +1 -1      kompare/kompareurldialog.cpp  
 M  +1 -1      umbrello/umbrello/dialogs/umlattributedialog.cpp  
 M  +1 -1      umbrello/umbrello/dialogs/umlentityattributedialog.cpp  
 M  +1 -1      umbrello/umbrello/dialogs/umloperationdialog.cpp  


--- trunk/KDE/kdesdk/CMakeLists.txt #553010:553011
@@ -6,6 +6,7 @@
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 include (MacroLibrary)
+include (FindQtDBus)
 
 # are these two really required ?
 find_package(ZLIB REQUIRED)
@@ -16,7 +17,7 @@
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
 link_directories (${KDE4_LIB_DIR})
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
 
 include (ConfigureChecks.cmake)
--- trunk/KDE/kdesdk/cervisia/logdlg.cpp #553010:553011
@@ -573,7 +573,7 @@
     {
         enableButton(User1, true);  // annotate
         enableButton(User2, false); // diff
-        enableButtonOK(false);      // view
+        enableButtonOk(false);      // view
         enableButtonApply(false);   // create patch
     }
     // both versions selected?
@@ -581,7 +581,7 @@
     {
         enableButton(User1, false); // annotate
         enableButton(User2, true);  // diff
-        enableButtonOK(false);      // view
+        enableButtonOk(false);      // view
         enableButtonApply(true);    // create patch
     }
     // only single version selected?
@@ -589,7 +589,7 @@
     {
         enableButton(User1, true);  // annotate
         enableButton(User2, true);  // diff
-        enableButtonOK(true);       // view
+        enableButtonOk(true);       // view
         enableButtonApply(true);    // create patch
     }
 }
--- trunk/KDE/kdesdk/kbugbuster/gui/packageselectdialog.cpp #553010:553011
@@ -88,7 +88,7 @@
     topLayout->addWidget( mPackageEdit );
     connect( mPackageEdit, SIGNAL( textChanged( const QString & ) ),
              SLOT( completeTyped( const QString & ) ) );
-    enableButtonOK( !mPackageEdit->text().isEmpty() );
+    enableButtonOk( !mPackageEdit->text().isEmpty() );
 }
 
 PackageSelectDialog::~PackageSelectDialog()
@@ -138,7 +138,7 @@
         // Why does a QLineEdit->setText() call emit the textChanged() signal?
         mPackageEdit->blockSignals( true );
         mPackageEdit->setText( item->text( 0 ) );
-        enableButtonOK(true);
+        enableButtonOk(true);
         mPackageEdit->blockSignals( false );
     }
 }
@@ -214,5 +214,5 @@
     } else {
       mCompleteList->resetTyped();
     }
-    enableButtonOK( !typed.isEmpty() );
+    enableButtonOk( !typed.isEmpty() );
 }
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/toplevel.h #553010:553011
@@ -28,7 +28,6 @@
 #include <QLabel>
 #include <Q3PopupMenu>
 
-#include <dcopobject.h>
 #include <kmainwindow.h>
 
 #include "traceitemview.h"
--- trunk/KDE/kdesdk/kompare/kompareurldialog.cpp #553010:553011
@@ -94,7 +94,7 @@
 
 void KompareURLDialog::slotEnableOk()
 {
-	enableButtonOK( !m_filesPage->firstURLRequester()->url().isEmpty() &&
+	enableButtonOk( !m_filesPage->firstURLRequester()->url().isEmpty() &&
 	                !m_filesPage->secondURLRequester()->url().isEmpty() );
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp #553010:553011
@@ -152,7 +152,7 @@
 
 void UMLAttributeDialog::slotNameChanged( const QString &_text )
 {
-    enableButtonOK( !_text.isEmpty() );
+    enableButtonOk( !_text.isEmpty() );
 }
 
 bool UMLAttributeDialog::apply() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #553010:553011
@@ -180,7 +180,7 @@
 
 void UMLEntityAttributeDialog::slotNameChanged( const QString &_text )
 {
-    enableButtonOK( !_text.isEmpty() );
+    enableButtonOk( !_text.isEmpty() );
 }
 
 bool UMLEntityAttributeDialog::apply() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp #553010:553011
@@ -259,7 +259,7 @@
 
 void UMLOperationDialog::slotNameChanged( const QString &_text )
 {
-    enableButtonOK( !_text.isEmpty() );
+    enableButtonOk( !_text.isEmpty() );
 }