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

List:       kde-commits
Subject:    KDE/kdevplatform
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-11-22 23:00:40
Message-ID: 1258930840.466834.26075.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1052998 by apaku:

hasValidData() is needed to be able to do vcs-specific checks on the
input (like valid svn urls).

 M  +6 -0      plugins/cvs/importmetadatawidget.cpp  
 M  +1 -0      plugins/cvs/importmetadatawidget.h  
 M  +6 -0      plugins/subversion/svnimportmetadatawidget.cpp  
 M  +1 -1      plugins/subversion/svnimportmetadatawidget.h  
 M  +5 -0      vcs/dvcs/ui/importmetadatawidget.cpp  
 M  +1 -0      vcs/dvcs/ui/importmetadatawidget.h  
 M  +7 -0      vcs/widgets/vcsimportmetadatawidget.h  


--- trunk/KDE/kdevplatform/plugins/cvs/importmetadatawidget.cpp #1052997:1052998
@@ -69,4 +69,10 @@
     m_ui->sourceLoc->setEnabled( enable );
 }
 
+bool ImportMetadataWidget::hasValidData() const
+{
+    return !m_ui->comment->toPlainText().isEmpty() && !m_ui->sourceLoc->text().isEmpty()
+    && !m_ui->module->text().isEmpty() && !m_ui->repository->text().isEmpty();
+}
+
 #include "importmetadatawidget.moc"
--- trunk/KDE/kdevplatform/plugins/cvs/importmetadatawidget.h #1052997:1052998
@@ -40,6 +40,7 @@
     virtual QString message() const;
     virtual void setSourceLocation( const KDevelop::VcsLocation& );
     virtual void setSourceLocationEditable( bool );
+    virtual bool hasValidData() const;
 
 private:
     Ui::ImportMetadataWidget* m_ui;
--- trunk/KDE/kdevplatform/plugins/subversion/svnimportmetadatawidget.cpp #1052997:1052998
@@ -67,4 +67,10 @@
     return m_ui->message->toPlainText();
 }
 
+bool SvnImportMetadataWidget::hasValidData() const
+{
+    return !m_ui->message->toPlainText().isEmpty() && !m_ui->srcEdit->text().isEmpty();
+}
+
+
 #include "svnimportmetadatawidget.moc"
--- trunk/KDE/kdevplatform/plugins/subversion/svnimportmetadatawidget.h #1052997:1052998
@@ -32,7 +32,7 @@
     virtual KDevelop::VcsLocation destination() const;
     virtual QString message() const;
     virtual void setUseSourceDirForDestination( bool );
-
+    virtual bool hasValidData() const;
 private:
     bool useSourceDirForDestination;
     Ui::SvnImportMetadataWidget *m_ui;
--- trunk/KDE/kdevplatform/vcs/dvcs/ui/importmetadatawidget.cpp #1052997:1052998
@@ -73,4 +73,9 @@
     m_ui->sourceLoc->setEnabled( enable );
 }
 
+bool ImportMetadataWidget::hasValidData() const
+{
+    return !m_ui->sourceLoc->text().isEmpty();
+}
+
 #include "importmetadatawidget.moc"
--- trunk/KDE/kdevplatform/vcs/dvcs/ui/importmetadatawidget.h #1052997:1052998
@@ -46,6 +46,7 @@
     virtual QString message() const; //Is not used, it returns QString("")
     virtual void setSourceLocation( const KDevelop::VcsLocation& );
     virtual void setSourceLocationEditable( bool );
+    virtual bool hasValidData() const;
 
 private:
     Ui::ImportMetadataWidget* m_ui;
--- trunk/KDE/kdevplatform/vcs/widgets/vcsimportmetadatawidget.h #1052997:1052998
@@ -41,7 +41,14 @@
     virtual KUrl source() const = 0;
     virtual VcsLocation destination() const = 0;
     virtual QString message() const = 0;
+
     /**
+     * Check wether the given data is valid.
+     * @returns true if all data in the widget is valid
+     */
+    virtual bool hasValidData() const = 0;
+    
+    /**
      * Select wether the widget should re-use the last part of the source location
      * for the destination. The default implementation simply ignores this setting.
      */
[prev in list] [next in list] [prev in thread] [next in thread]