diff options
Diffstat (limited to 'kgantt/kgantt')
| -rw-r--r-- | kgantt/kgantt/KGantt.cpp | 4 | ||||
| -rw-r--r-- | kgantt/kgantt/KGantt.h | 9 | ||||
| -rw-r--r-- | kgantt/kgantt/KGanttBarConfig.cpp | 4 | ||||
| -rw-r--r-- | kgantt/kgantt/KGanttBarConfig.h | 5 | ||||
| -rw-r--r-- | kgantt/kgantt/KGanttItem.cpp | 24 | ||||
| -rw-r--r-- | kgantt/kgantt/KGanttItem.h | 21 | ||||
| -rw-r--r-- | kgantt/kgantt/KGanttRelation.cpp | 2 | ||||
| -rw-r--r-- | kgantt/kgantt/KGanttRelation.h | 7 | ||||
| -rw-r--r-- | kgantt/kgantt/itemedit.ui | 74 | ||||
| -rw-r--r-- | kgantt/kgantt/itemedit2.ui | 36 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttBarView.cpp | 4 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttBarView.h | 9 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttBarViewPort.cpp | 34 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttBarViewPort.h | 17 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttBarViewPort_Events.cpp | 26 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttListView.cpp | 4 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttListView.h | 9 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttListViewPort.cpp | 6 | ||||
| -rw-r--r-- | kgantt/kgantt/xQGanttListViewPort.h | 9 |
19 files changed, 156 insertions, 148 deletions
diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp index 249f11ad..a3360c7a 100644 --- a/kgantt/kgantt/KGantt.cpp +++ b/kgantt/kgantt/KGantt.cpp @@ -15,8 +15,8 @@ KGantt::KGantt(KGanttItem* toplevelitem, - TQWidget* parent, const char * name, WFlags f) - : TQWidget(parent,name,f) + TQWidget* tqparent, const char * name, WFlags f) + : TQWidget(tqparent,name,f) { #ifdef _DEBUG_ printf("KGantt::KGantt()\n"); diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 5cfe559c..7448e01a 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -49,7 +49,7 @@ /** * \mainpage KGantt Module <br> <IMG SRC="gantt.png"> * - * The kgantt module tqcontains several classes (KGanttItem, KGantt) + * The kgantt module contains several classes (KGanttItem, KGantt) * for drawing and editing gantt-diagramms. * * This example shows how to use the gantt module: @@ -83,15 +83,16 @@ /// Gantt Widget. /*! - * A gantt widget tqcontains two parts, a list view and a + * A gantt widget contains two parts, a list view and a * bar view. */ //////////////////////////////// -class KDE_EXPORT KGantt : public QWidget +class KDE_EXPORT KGantt : public TQWidget //////////////////////////////// { Q_OBJECT + TQ_OBJECT public: @@ -102,7 +103,7 @@ public: * */ KGantt(KGanttItem* toplevelitem = 0, - TQWidget* parent = 0, const char * name=0, WFlags f=0 ); + TQWidget* tqparent = 0, const char * name=0, WFlags f=0 ); /// Destructor. diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp index ff5f4ee8..e41dc7c6 100644 --- a/kgantt/kgantt/KGanttBarConfig.cpp +++ b/kgantt/kgantt/KGanttBarConfig.cpp @@ -13,9 +13,9 @@ KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview, - TQWidget* parent, + TQWidget* tqparent, const char * name, WFlags f) - : TQWidget(parent,name,f) + : TQWidget(tqparent,name,f) { _barview = barview; KColorButton* b = new KColorButton(this); diff --git a/kgantt/kgantt/KGanttBarConfig.h b/kgantt/kgantt/KGanttBarConfig.h index 88049fea..e12475b1 100644 --- a/kgantt/kgantt/KGanttBarConfig.h +++ b/kgantt/kgantt/KGanttBarConfig.h @@ -34,15 +34,16 @@ class xQGanttBarView; -class KGanttBarConfig : public QWidget +class KGanttBarConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: KGanttBarConfig(xQGanttBarView* barview, - TQWidget* parent = 0, const char* name=0, WFlags f=0); + TQWidget* tqparent = 0, const char* name=0, WFlags f=0); protected slots: diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp index 3632e170..7939d49c 100644 --- a/kgantt/kgantt/KGanttItem.cpp +++ b/kgantt/kgantt/KGanttItem.cpp @@ -12,28 +12,28 @@ TQBrush KGanttItem::_selectBrush(TQColor(255,0,0)); -KGanttItem::KGanttItem(KGanttItem* parentItem, const TQString& text, +KGanttItem::KGanttItem(KGanttItem* tqparentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end) : TQObject() //////////////////////////////////////////////////////// { - init(parentItem,text, start,end); + init(tqparentItem,text, start,end); } -KGanttItem::KGanttItem(KGanttItem* parentItem, const TQString& text, +KGanttItem::KGanttItem(KGanttItem* tqparentItem, const TQString& text, const TQDateTime& start, long durationMin) : TQObject() //////////////////////////////////////////////////////// { - init(parentItem, text, start, start.addSecs( durationMin * 60)); + init(tqparentItem, text, start, start.addSecs( durationMin * 60)); } void -KGanttItem::init(KGanttItem* parentItem, const TQString& text, +KGanttItem::init(KGanttItem* tqparentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end) /////////////////////////////////////////////////////////////// { @@ -55,10 +55,10 @@ KGanttItem::init(KGanttItem* parentItem, const TQString& text, _start = start; _minDateTime = start; _end = end; _maxDateTime = end; - _parentItem = parentItem; + _tqparentItem = tqparentItem; - if(_parentItem) - _parentItem->registerItem(this); + if(_tqparentItem) + _tqparentItem->registerItem(this); } @@ -71,8 +71,8 @@ KGanttItem::~KGanttItem() printf("-> delete %s \n", getText().latin1() ); #endif - if(_parentItem) - _parentItem->unregisterItem(this); + if(_tqparentItem) + _tqparentItem->unregisterItem(this); _subitems.setAutoDelete(true); _subitems.clear(); @@ -90,7 +90,7 @@ KGanttRelation* KGanttItem::addRelation(KGanttItem* from, KGanttItem* to, const TQString& text) { - if(_subitems.tqcontainsRef(from) > 0 && _subitems.tqcontainsRef(to) >0) { + if(_subitems.containsRef(from) > 0 && _subitems.containsRef(to) >0) { KGanttRelation* rel = new KGanttRelation(from,to,text); _relations.append(rel); @@ -595,7 +595,7 @@ KGanttItem::dump(TQTextOStream& cout, const TQString& pre) } -QString +TQString KGanttItem::ChangeAsString(Change c) ////////////////////////////////// { diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h index fb7feb04..a49c825b 100644 --- a/kgantt/kgantt/KGanttItem.h +++ b/kgantt/kgantt/KGanttItem.h @@ -25,9 +25,9 @@ changelog : 26 dec 2000, jh - 09 jan 2001, jh - added signal destroyed(xQTask*) + 09 jan 2001, jh - added signal destroyed(xTQTask*) - 11 jan 2001, jh changed to kde : xQTask -> KGanttItem + 11 jan 2001, jh changed to kde : xTQTask -> KGanttItem */ @@ -46,16 +46,17 @@ /// KGanttItem. /*! - * This class describes a item. It tqcontains dates on which the item starts and - * ends. It also tqcontains attributes that gouverns the graphical representation + * This class describes a item. It contains dates on which the item starts and + * ends. It also contains attributes that gouverns the graphical representation * in a gantt diagramm. */ ////////////////////////////////// -class KDE_EXPORT KGanttItem : public QObject +class KDE_EXPORT KGanttItem : public TQObject ////////////////////////////////// { Q_OBJECT + TQ_OBJECT public: @@ -121,7 +122,7 @@ public: // Draw handlke for opening/closing item. DrawHandle = 16, - /// Draw handle only if item tqcontains subitems + /// Draw handle only if item contains subitems DrawHandleWSubitems = 32, DrawAll = 255 @@ -138,7 +139,7 @@ public: /*! * */ - KGanttItem(KGanttItem* parentItem, const TQString& text, + KGanttItem(KGanttItem* tqparentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end); @@ -147,7 +148,7 @@ public: /*! * */ - KGanttItem(KGanttItem* parentItem, const TQString& text, + KGanttItem(KGanttItem* tqparentItem, const TQString& text, const TQDateTime& start, long durationMin); @@ -501,7 +502,7 @@ private: void registerItem(KGanttItem* item); void unregisterItem(KGanttItem* item); - void init(KGanttItem* parentItem, const TQString& text, + void init(KGanttItem* tqparentItem, const TQString& text, const TQDateTime& start, const TQDateTime& end); @@ -525,7 +526,7 @@ private: int _height, _style, _mode; - KGanttItem* _parentItem; + KGanttItem* _tqparentItem; TQPtrList<KGanttItem> _subitems; TQPtrList<KGanttRelation> _relations; diff --git a/kgantt/kgantt/KGanttRelation.cpp b/kgantt/kgantt/KGanttRelation.cpp index f95deea1..e5eab3b4 100644 --- a/kgantt/kgantt/KGanttRelation.cpp +++ b/kgantt/kgantt/KGanttRelation.cpp @@ -138,7 +138,7 @@ KGanttRelation::dump(TQTextOStream& cout, const TQString& pre) } -QString +TQString KGanttRelation::ChangeAsString(Change c) ////////////////////////////////// { diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h index 8ab96c5d..a75cec9b 100644 --- a/kgantt/kgantt/KGanttRelation.h +++ b/kgantt/kgantt/KGanttRelation.h @@ -40,16 +40,17 @@ class KGanttItem; /// KGanttRelation. /*! - * This class describes a item. It tqcontains dates on which the item starts and - * ends. It also tqcontains attributes that gouverns the graphical representation + * This class describes a item. It contains dates on which the item starts and + * ends. It also contains attributes that gouverns the graphical representation * in a gantt diagramm. */ ////////////////////////////////// -class KGanttRelation : public QObject +class KGanttRelation : public TQObject ////////////////////////////////// { Q_OBJECT + TQ_OBJECT friend class KGanttItem; diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui index 3be22f9e..2b2e2a67 100644 --- a/kgantt/kgantt/itemedit.ui +++ b/kgantt/kgantt/itemedit.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_itemTextLabel</cstring> </property> @@ -53,7 +53,7 @@ <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -81,7 +81,7 @@ </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>_minStartMinuetEdit</cstring> </property> @@ -95,7 +95,7 @@ <number>2</number> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>_minStartHourEdit</cstring> </property> @@ -109,12 +109,12 @@ <number>2</number> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>_minStartDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_minStartDateLabel</cstring> </property> @@ -130,7 +130,7 @@ <string>Date:</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>_minStartTimeSepatatorLabel</cstring> </property> @@ -144,7 +144,7 @@ <string>:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_minStartTimeLabel</cstring> </property> @@ -162,7 +162,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="3" column="2"> + <widget class="TQGroupBox" row="3" column="2"> <property name="name"> <cstring>groupBox11</cstring> </property> @@ -173,7 +173,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>_maxStartHourEdit</cstring> </property> @@ -187,12 +187,12 @@ <number>2</number> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>_maxStartDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>_maxStartTimeSepatatorLabel</cstring> </property> @@ -206,7 +206,7 @@ <string>:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>_maxStartMinuetEdit</cstring> </property> @@ -237,7 +237,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_maxStartTimeLabel</cstring> </property> @@ -253,7 +253,7 @@ <string>Time:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_maxStartDateLabel</cstring> </property> @@ -271,7 +271,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -282,7 +282,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_startTimeLabel</cstring> </property> @@ -315,7 +315,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>_startTimeSepatatorLabel</cstring> </property> @@ -329,7 +329,7 @@ <string>:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_startDateLabel</cstring> </property> @@ -345,12 +345,12 @@ <string>Date:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>_startDateEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>_startHourEdit</cstring> </property> @@ -364,7 +364,7 @@ <number>2</number> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>_startMinuetEdit</cstring> </property> @@ -380,7 +380,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="2"> + <widget class="TQGroupBox" row="2" column="2"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -391,7 +391,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>_endMinuetEdit</cstring> </property> @@ -422,12 +422,12 @@ </size> </property> </spacer> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>_endDateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_endTimeLabel</cstring> </property> @@ -443,7 +443,7 @@ <string>Time:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_endDateLabel</cstring> </property> @@ -459,7 +459,7 @@ <string>Date:</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>_endTimeSeparator</cstring> </property> @@ -473,7 +473,7 @@ <string>:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>_endHourEdit</cstring> </property> @@ -489,7 +489,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -500,7 +500,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>mode1</string> @@ -528,7 +528,7 @@ <number>20</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>style1</string> @@ -548,7 +548,7 @@ <cstring>_styleStyleCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_styleStyleLabel</cstring> </property> @@ -564,7 +564,7 @@ <string>Style:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>_styleModeLabel</cstring> </property> @@ -580,7 +580,7 @@ <string>Mode:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_styleHeightLabel</cstring> </property> @@ -598,7 +598,7 @@ </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>_itemTextEdit</cstring> </property> diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui index bdcc0eb7..d77d2f5f 100644 --- a/kgantt/kgantt/itemedit2.ui +++ b/kgantt/kgantt/itemedit2.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Form1</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -26,12 +26,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>_itemTextEdit</cstring> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>style1</string> @@ -70,7 +70,7 @@ <number>20</number> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>mode1</string> @@ -90,7 +90,7 @@ <cstring>_styleModeCombo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_styleHeightLabel</cstring> </property> @@ -106,7 +106,7 @@ <string>Height:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>_styleModeLabel</cstring> </property> @@ -122,7 +122,7 @@ <string>Mode:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_styleStyleLabel</cstring> </property> @@ -140,7 +140,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -151,7 +151,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="4"> <item> <property name="text"> <string>Start</string> @@ -176,7 +176,7 @@ <cstring>_dateTimeEditCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>_dateTimeTimeLabel</cstring> </property> @@ -192,7 +192,7 @@ <string>Time:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>_dateTimeDateLabel</cstring> </property> @@ -208,12 +208,12 @@ <string>Date:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>_startDateEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>_dateTimeHourEdit</cstring> </property> @@ -227,7 +227,7 @@ <number>2</number> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>_startTimeSepatatorLabel</cstring> </property> @@ -241,7 +241,7 @@ <string>:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="3"> + <widget class="TQLineEdit" row="2" column="3"> <property name="name"> <cstring>_dateTimeMinuetEdit</cstring> </property> @@ -272,7 +272,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_dateTimeEditLabel</cstring> </property> @@ -290,7 +290,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>_itemTextLabel</cstring> </property> diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp index 7cc410d1..dc931499 100644 --- a/kgantt/kgantt/xQGanttBarView.cpp +++ b/kgantt/kgantt/xQGanttBarView.cpp @@ -12,9 +12,9 @@ xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem, - TQWidget* parent, + TQWidget* tqparent, const char * name, WFlags f) - : TQScrollView(parent,name,f) + : TQScrollView(tqparent,name,f) { _config = NULL; diff --git a/kgantt/kgantt/xQGanttBarView.h b/kgantt/kgantt/xQGanttBarView.h index 08105727..d9037b40 100644 --- a/kgantt/kgantt/xQGanttBarView.h +++ b/kgantt/kgantt/xQGanttBarView.h @@ -1,5 +1,5 @@ -#ifndef _XQGANTTBARVIEW_H_ -#define _XQGANTTBARVIEW_H_ +#ifndef _XTQGANTTBARVIEW_H_ +#define _XTQGANTTBARVIEW_H_ /* @@ -47,11 +47,12 @@ class KGanttBarConfig; */ ////////////////////////////////////////// -class xQGanttBarView : public QScrollView +class xQGanttBarView : public TQScrollView ////////////////////////////////////////// { Q_OBJECT + TQ_OBJECT public: @@ -61,7 +62,7 @@ public: /*! * */ - xQGanttBarView(KGanttItem* toplevelitem, TQWidget* parent = 0, + xQGanttBarView(KGanttItem* toplevelitem, TQWidget* tqparent = 0, const char * name=0, WFlags f=0 ); diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 2ee7ad02..c1dc60d6 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -22,12 +22,12 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, - xQGanttBarView* parent, + xQGanttBarView* tqparent, const char * name, WFlags f) - : TQFrame(parent,name,f) + : TQFrame(tqparent,name,f) ///////////////////////////////////////////////////////////////////////////// { - _parent = parent; + _tqparent = tqparent; closedIcon = TQPixmap(open_xpm); openedIcon = TQPixmap(close_xpm); @@ -35,7 +35,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, _observedList = NULL; _toolbar = NULL; - _gItemList = TQPtrDict<xQTaskPosition>(449); + _gItemList = TQPtrDict<xTQTaskPosition>(449); _gItemList.setAutoDelete(true); _toplevelitem = toplevelitem; @@ -107,7 +107,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) { if(_toolbar || mw == 0) return _toolbar; - _toolbar = new KToolBar(mw,TQMainWindow::DockTop); + _toolbar = new KToolBar(mw,TQMainWindow::TQt::DockTop); mw->addToolBar(_toolbar); @@ -239,7 +239,7 @@ xQGanttBarViewPort::initMenu() pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("configure.png not found !\n"); - _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig())); + _menu->insertItem(pix, i18n("Configure Gantt..."), _tqparent, TQT_SLOT(showConfig())); } @@ -420,8 +420,8 @@ xQGanttBarViewPort::recalc(KGanttItem* item, int xPos, int yPos, int _textPosY = yPos + (int) (0.7 * (double) tmpHeight * _scaleY); int _textPosX = xPos + dd + 18; - xQTaskPosition* tpos = - new xQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS, + xTQTaskPosition* tpos = + new xTQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS, _textPosX, _textPosY, depth); _gItemList.tqreplace(item, tpos ); @@ -459,7 +459,7 @@ void xQGanttBarViewPort::drawItem(KGanttItem* item, TQPainter* p, const TQRect& rect ) { - xQTaskPosition* tpos = _gItemList[item]; + xTQTaskPosition* tpos = _gItemList[item]; if(!tpos) return; @@ -589,8 +589,8 @@ xQGanttBarViewPort::drawRelation(TQPainter* p, KGanttItem* from = rel->getFrom(); KGanttItem* to = rel->getTo(); - xQTaskPosition* tpos_from = _gItemList[from]; - xQTaskPosition* tpos_to = _gItemList[to]; + xTQTaskPosition* tpos_from = _gItemList[from]; + xTQTaskPosition* tpos_to = _gItemList[to]; p->setPen(rel->getPen()); @@ -839,7 +839,7 @@ xQGanttBarViewPort::zoom(double sfactor, int sx, int sy) recalc(); adjustSize(); - _parent->center(screenX(wx), screenY(wy) ); + _tqparent->center(screenX(wx), screenY(wy) ); TQWidget::update(); @@ -854,12 +854,12 @@ xQGanttBarViewPort::zoom(double sfactor) { printf("zoom %f \n", sfactor ); - int x = (int) (_parent->visibleWidth()/2 + 0.5); - int y = (int) (_parent->visibleHeight()/2 + 0.5); + int x = (int) (_tqparent->visibleWidth()/2 + 0.5); + int y = (int) (_tqparent->visibleHeight()/2 + 0.5); printf("dx/2 = %d, dy/2 = %d \n", x,y); - zoom(sfactor, x + _parent->contentsX(), y + _parent->contentsY() ); + zoom(sfactor, x + _tqparent->contentsX(), y + _tqparent->contentsY() ); } @@ -872,7 +872,7 @@ xQGanttBarViewPort::zoomAll() printf("zoom all. scaleX = %f\n", _scaleX ); #endif - _scaleX = ((double) _parent->visibleWidth()*60)/ + _scaleX = ((double) _tqparent->visibleWidth()*60)/ ((double) (_toplevelitem->getStart().secsTo(_toplevelitem->getEnd()) + _marginX*120)); recalc(); @@ -910,7 +910,7 @@ xQGanttBarViewPort::addHoliday(int y, int m, int d) xQGanttBarViewPort::Position xQGanttBarViewPort::check(KGanttItem** founditem, int x, int y) { - TQPtrDictIterator<xQTaskPosition> it(_gItemList); + TQPtrDictIterator<xTQTaskPosition> it(_gItemList); static int ty, ty2, tx, tx2, hx, hx2, hy, hy2; bool increased; diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index 1b3de985..e84761e1 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -1,5 +1,5 @@ -#ifndef _XQGANTTBARVIEWPORT_H_ -#define _XQGANTTBARVIEWPORT_H_ +#ifndef _XTQGANTTBARVIEWPORT_H_ +#define _XTQGANTTBARVIEWPORT_H_ /* @@ -51,13 +51,13 @@ class xQGanttBarView; // This is an internal class. // helper for drawing items -class xQTaskPosition +class xTQTaskPosition //////////////////// { public : - xQTaskPosition(int nr, int x, int y, int w, int h, int hiSub, + xTQTaskPosition(int nr, int x, int y, int w, int h, int hiSub, int tPx, int tPy, int d) : _nr(nr), _screenX(x), _screenY(y), _screenW(w), _screenH(h), _screenHS(hiSub), _textPosX(tPx), _textPosY(tPy), _depth(d) @@ -85,11 +85,12 @@ public : */ ///////////////////////////////////////// -class KDE_EXPORT xQGanttBarViewPort : public QFrame +class KDE_EXPORT xQGanttBarViewPort : public TQFrame //////////////////////////////////////// { Q_OBJECT + TQ_OBJECT friend class xQGanttBarView; friend class KGantt; @@ -103,7 +104,7 @@ public: /*! * */ - xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* parent = 0, + xQGanttBarViewPort(KGanttItem* toplevelitem, xQGanttBarView* tqparent = 0, const char * name=0, WFlags f=0 ); @@ -123,7 +124,7 @@ public: - TQPtrDict<xQTaskPosition> _gItemList; + TQPtrDict<xTQTaskPosition> _gItemList; /// Add holiday. @@ -244,7 +245,7 @@ private: // this will be set by setParentScrollView() - xQGanttBarView* _parent; + xQGanttBarView* _tqparent; int _grid, _snapgrid; bool _drawGrid, _drawHeader; diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp index 1791689e..be6d38b5 100644 --- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp @@ -66,7 +66,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e) */ if(e->button() == MidButton && _mode == Select) { - xQTaskPosition* tp = _gItemList.find(_currentItem); + xTQTaskPosition* tp = _gItemList.tqfind(_currentItem); TQPainter p(this); TQRect rect = p.boundingRect(tp->_textPosX, @@ -118,7 +118,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e) _itemInfo->setText( tmp ); _itemInfo->adjustSize(); - _itemInfo->move(e->x() + 25, _gItemList.find(_currentItem)->_screenY - 50 ); + _itemInfo->move(e->x() + 25, _gItemList.tqfind(_currentItem)->_screenY - 50 ); _itemInfo->show(); } else @@ -245,7 +245,7 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e) double sys_width = fabs(x2 - x1); - double mass = (_parent->visibleWidth()/ sys_width); + double mass = (_tqparent->visibleWidth()/ sys_width); zoom(mass, (int) (x1+(x2-x1)/2), (int) (y1+(y2-y1)/2) ); @@ -298,7 +298,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e) int pixeldiff = e->x() - _startPoint->x(); _timediff = (int) ((double) pixeldiff / _scaleX + 0.5 ); - xQTaskPosition* tpos = _gItemList[_currentItem]; + xTQTaskPosition* tpos = _gItemList[_currentItem]; int x = tpos->_screenX; int w = tpos->_screenW; @@ -366,15 +366,15 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e) _itemInfo->setText( stmp ); _itemInfo->adjustSize(); - _itemInfo->move(e->x() + 25, _gItemList.find(_currentItem)->_screenY - 50); + _itemInfo->move(e->x() + 25, _gItemList.tqfind(_currentItem)->_screenY - 50); _itemInfo->show(); if(oldx > 0) { - p.fillRect(oldx, _gItemList.find(_currentItem)->_screenY, - oldw, _gItemList.find(_currentItem)->_screenH, + p.fillRect(oldx, _gItemList.tqfind(_currentItem)->_screenY, + oldw, _gItemList.tqfind(_currentItem)->_screenH, TQBrush(TQColor(50,50,50), Dense4Pattern)); - p.drawRect(oldx, _gItemList.find(_currentItem)->_screenY, - oldw, _gItemList.find(_currentItem)->_screenH); + p.drawRect(oldx, _gItemList.tqfind(_currentItem)->_screenY, + oldw, _gItemList.tqfind(_currentItem)->_screenH); p.setPen(_solidPen); if(_changeStart) @@ -386,11 +386,11 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e) } p.setPen(_dashPen); - p.fillRect(x, _gItemList.find(_currentItem)->_screenY, - w, _gItemList.find(_currentItem)->_screenH, + p.fillRect(x, _gItemList.tqfind(_currentItem)->_screenY, + w, _gItemList.tqfind(_currentItem)->_screenH, TQBrush(TQColor(50,50,50), Dense4Pattern) ); - p.drawRect(x, _gItemList.find(_currentItem)->_screenY, - w, _gItemList.find(_currentItem)->_screenH); + p.drawRect(x, _gItemList.tqfind(_currentItem)->_screenY, + w, _gItemList.tqfind(_currentItem)->_screenH); p.setPen(_solidPen); if(_changeStart) diff --git a/kgantt/kgantt/xQGanttListView.cpp b/kgantt/kgantt/xQGanttListView.cpp index 3f5f44c2..f5a587da 100644 --- a/kgantt/kgantt/xQGanttListView.cpp +++ b/kgantt/kgantt/xQGanttListView.cpp @@ -10,9 +10,9 @@ #include <tqcolor.h> #include <klocale.h> -xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent, +xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent, const char * name, WFlags f) - : TQScrollView(parent,name,f) + : TQScrollView(tqparent,name,f) ///////////////////////////////////////////////////////// { _toplevelitem = toplevelitem; diff --git a/kgantt/kgantt/xQGanttListView.h b/kgantt/kgantt/xQGanttListView.h index ff002a7b..fa0f973d 100644 --- a/kgantt/kgantt/xQGanttListView.h +++ b/kgantt/kgantt/xQGanttListView.h @@ -1,5 +1,5 @@ -#ifndef _XQGANTTLISTVIEW_H_ -#define _XQGANTTLISTVIEW_H_ +#ifndef _XTQGANTTLISTVIEW_H_ +#define _XTQGANTTLISTVIEW_H_ /* @@ -44,11 +44,12 @@ */ ////////////////////////////////////////////// -class xQGanttListView : public QScrollView +class xQGanttListView : public TQScrollView ////////////////////////////////////////////// { Q_OBJECT + TQ_OBJECT public: @@ -58,7 +59,7 @@ public: /*! * */ - xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent = 0, + xQGanttListView(KGanttItem* toplevelitem, TQWidget* tqparent = 0, const char * name=0, WFlags f=0 ); diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp index a792ad99..2549c880 100644 --- a/kgantt/kgantt/xQGanttListViewPort.cpp +++ b/kgantt/kgantt/xQGanttListViewPort.cpp @@ -13,9 +13,9 @@ int xQGanttListViewPort::_ListViewCounter = 0; -xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent, +xQGanttListViewPort::xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent, const char * name, WFlags f ) - : TQFrame(parent,name,f) + : TQFrame(tqparent,name,f) { _toplevelitem = toplevelitem; @@ -109,7 +109,7 @@ xQGanttListViewPort::drawItem(KGanttItem* item, TQPainter* p, const TQRect& rect { static int margin = 2; - xQTaskPosition* tpos = _barviewport->_gItemList[item]; + xTQTaskPosition* tpos = _barviewport->_gItemList[item]; if(!tpos) return; diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h index cc16ca8c..bb0d1b15 100644 --- a/kgantt/kgantt/xQGanttListViewPort.h +++ b/kgantt/kgantt/xQGanttListViewPort.h @@ -1,5 +1,5 @@ -#ifndef _XQGANTTLISTVIEWPORT_H_ -#define _XQGANTTLISTVIEWPORT_H_ +#ifndef _XTQGANTTLISTVIEWPORT_H_ +#define _XTQGANTTLISTVIEWPORT_H_ /* @@ -44,11 +44,12 @@ */ //////////////////////////////////////////// -class xQGanttListViewPort : public QFrame +class xQGanttListViewPort : public TQFrame //////////////////////////////////////////// { Q_OBJECT + TQ_OBJECT friend class xQGanttListView; @@ -60,7 +61,7 @@ public: /*! * */ - xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* parent = 0, + xQGanttListViewPort(KGanttItem* toplevelitem, TQWidget* tqparent = 0, const char * name=0, WFlags f=0 ); |