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

List:       kde-commits
Subject:    kdepim/karm
From:       David Faure <faure () kde ! org>
Date:       2003-01-07 13:20:47
[Download RAW message or body]

CVS commit by faure: 

Name clash with kdeui's KTimeWidget!  -> renamed to KArmTimeWidget.


  M +3 -3      adddlg.cpp   1.25
  M +4 -4      adddlg.h   1.10
  M +3 -3      ktimewidget.cpp   1.5
  M +2 -2      ktimewidget.h   1.3


--- kdepim/karm/adddlg.cpp  #1.24:1.25
@@ -84,5 +84,5 @@ AddTaskDialog::AddTaskDialog(QString cap
   lay3->addWidget( _totalLA, 0, 0 );
 
-        _totalTW = new KTimeWidget( page, "_totalTW" );
+        _totalTW = new KArmTimeWidget( page, "_totalTW" );
         lay3->addWidget( _totalTW, 0, 1 );
   _totalLA->setBuddy( _totalTW );
@@ -93,5 +93,5 @@ AddTaskDialog::AddTaskDialog(QString cap
   lay3->addWidget( _sessionLA, 1, 0 );
 
-        _sessionTW = new KTimeWidget( page, "_sessionTW" );
+        _sessionTW = new KArmTimeWidget( page, "_sessionTW" );
   lay3->addWidget( _sessionTW, 1, 1 );
   _sessionLA->setBuddy( _sessionTW );
@@ -116,5 +116,5 @@ AddTaskDialog::AddTaskDialog(QString cap
         lay4->addSpacing(5);
         
-        _diffTW = new KTimeWidget( page, "_sessionAddTW" );
+        _diffTW = new KArmTimeWidget( page, "_sessionAddTW" );
         lay4->addWidget( _diffTW );
 

--- kdepim/karm/adddlg.h  #1.9:1.10
@@ -27,5 +27,5 @@
 #include "adddlg.h"
 class QLineEdit;
-class KTimeWidget;
+class KArmTimeWidget;
 class QRadioButton;
 
@@ -47,7 +47,7 @@ class AddTaskDialog : public KDialogBase
   private:
         QLineEdit* _name;
-          KTimeWidget* _totalTW;
-          KTimeWidget* _sessionTW;
-          KTimeWidget* _diffTW;
+          KArmTimeWidget* _totalTW;
+          KArmTimeWidget* _sessionTW;
+          KArmTimeWidget* _diffTW;
           QComboBox* _operator;
 

--- kdepim/karm/ktimewidget.cpp  #1.4:1.5
@@ -60,5 +60,5 @@ protected:
 
 
-KTimeWidget::KTimeWidget(  QWidget* parent, const char* name ) : QWidget(parent, name)
+KArmTimeWidget::KArmTimeWidget(  QWidget* parent, const char* name ) : QWidget(parent, name)
 {
         QHBoxLayout *layout = new QHBoxLayout(this);
@@ -91,5 +91,5 @@ KTimeWidget::KTimeWidget(  QWidget* pare
 }
 
-void KTimeWidget::setTime( int hour, int minute )
+void KArmTimeWidget::setTime( int hour, int minute )
 {
         QString dummy;
@@ -105,5 +105,5 @@ void KTimeWidget::setTime( int hour, int
 }
 
-long KTimeWidget::time() const
+long KArmTimeWidget::time() const
 {
         bool ok;

--- kdepim/karm/ktimewidget.h  #1.2:1.3
@@ -6,8 +6,8 @@ class QLineEdit;
 class KarmLineEdit;
 
-class KTimeWidget :public QWidget 
+class KArmTimeWidget :public QWidget 
 {
 public:
-        KTimeWidget( QWidget* parent = 0, const char* name = 0 );
+        KArmTimeWidget( QWidget* parent = 0, const char* name = 0 );
         void setTime( int hour, int minute );
         long time() const;


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