1 files changed, 6 insertions, 6 deletions
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index ca0f78f3f..70b423218 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -39,7 +39,7 @@
 #include <tqwidget.h>
 #include <tqlistview.h>
 #include <tqsplitter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfont.h>
 #include <tqdom.h>
 #include <tqvbox.h>
@@ -193,7 +193,7 @@ public:
                     KDGanttViewItem::Shape middle,
                     KDGanttViewItem::Shape end,
 		    bool overwriteExisting = true  );
-    bool shapes( KDGanttViewItem::Type type,
+    bool tqshapes( KDGanttViewItem::Type type,
                  KDGanttViewItem::Shape& start,
                  KDGanttViewItem::Shape& middle,
                  KDGanttViewItem::Shape& end ) const;
@@ -228,7 +228,7 @@ public:
     TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const;
 
     // Legend-related stuff
-    void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
+    void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
     void clearLegend();
     // Header-related stuff
     void setHorizonStart( const TQDateTime& start );
@@ -298,7 +298,7 @@ public:
     void setWeekendDays( int start, int end );
     void weekendDays( int& start, int& end ) const;
 
-    static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize);
+    static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize);
 
     void setHeaderVisible( bool );
     bool headerVisible() const;
@@ -330,7 +330,7 @@ public:
     virtual void lvStartDrag (KDGanttViewItem*);
     virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*);
     virtual void lvDragEnterEvent (TQDragEnterEvent * e );
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     KDGanttViewItem* getItemByName( const TQString& name ) const;
     TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const;
     KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const;
@@ -422,7 +422,7 @@ private slots:
     void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse );
 private:
     struct legendItem {
-      KDGanttViewItem::Shape shape;
+      KDGanttViewItem::Shape tqshape;
       TQColor color;
       TQString text;
     };