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

List:       kde-commits
Subject:    KDE/kdelibs/kde3support
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-03-20 12:26:35
Message-ID: 1174393595.820587.1185.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 644567 by mueller:

compile++


 M  +1 -2      CMakeLists.txt  
 M  +1 -1      kdeui/k3dockwidget.cpp  
 M  +6 -6      kdeui/k3dockwidget.h  
 M  +0 -2      kdeui/k3iconviewsearchline.cpp  
 M  +0 -2      kdeui/k3listviewsearchline.cpp  


--- trunk/KDE/kdelibs/kde3support/CMakeLists.txt #644566:644567
@@ -9,14 +9,13 @@
 # all dependent libs
 include_directories( ${KDE4_KPARTS_INCLUDES} )
 
-add_definitions ( -DQT3_SUPPORT )
+add_definitions( -DQT3_SUPPORT -DKDE3_SUPPORT -DIN_KDE3_SUPPORT)
 
 if(UNIX)
    add_subdirectory( kunittest )
    add_subdirectory( tests )
 endif(UNIX)
 
-add_definitions(-DKDE3_SUPPORT)
 
 ########### next target ###############
 
--- trunk/KDE/kdelibs/kde3support/kdeui/k3dockwidget.cpp #644566:644567
@@ -440,7 +440,7 @@
 #ifndef NO_KDE2
 void K3DockWidgetHeader::saveConfig( KConfig* c )
 {
-    c->writeEntry( QString("%1%2").arg(parent()->name()).arg(":stayButton"), \
QVariant(stayButton->isChecked()) ); +    c->writeEntry( \
QString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isChecked() );  \
}  
 void K3DockWidgetHeader::loadConfig( KConfig* c )
--- trunk/KDE/kdelibs/kde3support/kdeui/k3dockwidget.h #644566:644567
@@ -530,7 +530,7 @@
    *
    * @return The pointer to the dockwidget's child widget, 0L if there's no such \
                child.
    */
-  QWidget* getWidget() const { return widget; };
+  QWidget* getWidget() const { return widget; }
 
   /**
    * Sets the header of this dockwidget.
@@ -589,12 +589,12 @@
    *
    * @param ttStr A string for the tooltip on the tab.
    */
-  void setToolTipString(const QString& ttStr) { toolTipStr = ttStr; };
+  void setToolTipString(const QString& ttStr) { toolTipStr = ttStr; }
 
   /**
    * @return The tooltip string being shown on the appropriate tab page header when \
                in dock-centered mode.
    */
-  const QString& toolTipString() const { return toolTipStr; };
+  const QString& toolTipString() const { return toolTipStr; }
 
   /**
    * @return result @p true, if a dockback is possible, otherwise @p false.
@@ -605,12 +605,12 @@
    * Sets a string that is used for the label of the tab page when in tab page mode
    * @param label The new tab page label.
    */
-  void setTabPageLabel( const QString& label) { tabPageTitle = label; };
+  void setTabPageLabel( const QString& label) { tabPageTitle = label; }
 
   /**
    * @return A string that is used for the label of the tab page when in tab page \
                mode.
    */
-  const QString& tabPageLabel() const { return tabPageTitle; };
+  const QString& tabPageLabel() const { return tabPageTitle; }
 
   /**
    * Catches and processes some QWidget events that are interesting for dockwidgets.
@@ -1097,7 +1097,7 @@
     {
       dock = _dock;
       hide = _hide;
-    };
+    }
     ~MenuDockData(){}
 
     K3DockWidget* dock;
--- trunk/KDE/kdelibs/kde3support/kdeui/k3iconviewsearchline.cpp #644566:644567
@@ -23,8 +23,6 @@
  * would be reimplemented.
  */
 
-#define QT3_SUPPORT
-
 #include "k3iconviewsearchline.h"
 
 #include <q3iconview.h>
--- trunk/KDE/kdelibs/kde3support/kdeui/k3listviewsearchline.cpp #644566:644567
@@ -17,8 +17,6 @@
    Boston, MA 02110-1301, USA.
 */
 
-#define QT3_SUPPORT
-
 #include "k3listviewsearchline.h"
 
 #include <k3listview.h>


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