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

List:       kde-commits
Subject:    KDE/kdelibs
From:       Laurent Montel <montel () kde ! org>
Date:       2005-08-09 7:34:01
Message-ID: 1123572841.600031.2682.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 444204 by mlaurent:

Merge function into kinputdialog
Remove unused variable


 M  +3 -0      KDE4PORTING.html  
 M  +1 -8      kdeui/kinputdialog.cpp  
 M  +4 -17     kdeui/kinputdialog.h  
 M  +0 -9      kdeui/kruler.h  


--- trunk/KDE/kdelibs/KDE4PORTING.html #444203:444204
@@ -143,6 +143,9 @@
 <H4>KStdAction</H4>
 <li>showToolbar() methods have been removed, see \
KMainWindow::setStandardToolBarMenuEnabled()</li>  
+<H4>KInputDialog</H4>
+<li>static QString KInputDialog::text( const QString &caption,...) was replaced by \
QString KInputDialog::getText( const QString &caption,...) +
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
 
--- trunk/KDE/kdelibs/kdeui/kinputdialog.cpp #444203:444204
@@ -255,15 +255,8 @@
   delete d;
 }
 
-QString KInputDialog::getText( const QString &caption, const QString &label,
-    const QString &value, bool *ok, QWidget *parent, const char *name,
-    QValidator *validator, const QString &mask )
-{
-  return text( caption, label, value, ok, parent, name, validator, mask,
-               QString::null );
-}
 
-QString KInputDialog::text( const QString &caption,
+QString KInputDialog::getText( const QString &caption,
     const QString &label, const QString &value, bool *ok, QWidget *parent,
     const char *name, QValidator *validator, const QString &mask,
     const QString &whatsThis )
--- trunk/KDE/kdelibs/kdeui/kinputdialog.h #444203:444204
@@ -110,29 +110,16 @@
      * @param name      Name of the dialog widget
      * @param validator A @ref QValidator to be associated with the line edit
      * @param mask      Mask associated with the line edit. See the
-     *                  documentation for @ref QLineEdit about masks.
-     *
+     *                  documentation for @ref QLineEdit about masks
+     * @param whatsThis a QWhatsThis text for the input widget.
      * @return String user entered if Ok was pressed, else a null string
      */
     static QString getText( const QString &caption, const QString &label,
         const QString &value=QString::null, bool *ok=0, QWidget *parent=0,
         const char *name=0, QValidator *validator=0,
-        const QString &mask=QString::null );
+        const QString &mask=QString::null, 
+	const QString& whatsThis=QString::null  );
 
-    /** 
-     * Same as @ref getText except it provides an extra parameter to specify 
-     * a QWhatsThis text for the input widget.
-     *
-     * ### KDE4: Merge with getText.
-     *
-     * @since KDE 3.3
-     **/
-    static QString text( const QString &caption, const QString &label, 
-        const QString &value=QString::null, bool *ok=0, QWidget *parent=0, 
-        const char *name=0, QValidator *validator=0,
-        const QString &mask=QString::null,
-        const QString& whatsThis=QString::null );
-
     /**
      * Static convenience function to get a multiline string from the user.
      *
--- trunk/KDE/kdelibs/kdeui/kruler.h #444203:444204
@@ -428,15 +428,6 @@
   bool showbm;
   bool showem;
 
-  // #### KDE4 : All value* and show* below should be removed, unused
-
-  int valuelm; /* value per little, medium, big mark */
-  int valuemm;
-  int valuebm;
-  bool showValuelm;
-  bool showValuemm;
-  bool showValuebm;
-
   double ppm; /* pixel per mark */
 
   QString endlabel;


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