TQt4 port basket

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1232416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 48 insertions, 48 deletions

diff --git a/src/note.h b/src/note.h
index cb249ec..736a7e8 100644
--- a/src/note.h
+++ b/src/note.h
@@ -21,10 +21,10 @@
 #ifndef NOTE_H
 #define NOTE_H
 
-#include <qstring.h>
-#include <qpixmap.h>
+#include <tqstring.h>
+#include <tqpixmap.h>
 #include <kpixmap.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
 
 #include "notecontent.h"
 #include "tag.h"
@@ -35,8 +35,8 @@ class HtmlExportData;
 
 class NoteSelection;
 
-class QPainter;
-class QSimpleRichText;
+class TQPainter;
+class TQSimpleRichText;
 
 /** Handle basket notes and groups!\n
   * After creation, the note is a group. You should create a NoteContent with this Note
@@ -44,7 +44,7 @@ class QSimpleRichText;
   * @code
   * Note *note = new Note(basket);   // note is a group!
   * new TextContent(note, fileName); // note is now a note with a text content!
-  * new ColorContent(note, Qt::red); // Should never be done!!!!! the old Content should be deleted...
+  * new ColorContent(note, TQt::red); // Should never be done!!!!! the old Content should be deleted...
   * @endcode
   * @author S�astien Laot
   */
@@ -52,7 +52,7 @@ class Note
 {
 /// CONSTRUCTOR AND DESTRUCTOR:
   public:
-	Note(Basket *parent);
+	Note(Basket *tqparent);
 	~Note();
 
 /// DOUBLY LINKED LIST:
@@ -74,7 +74,7 @@ class Note
 //	int m_minContentWidth;
   public:
 	void setWidth(int width);
-	void setWidthForceRelayout(int width);
+	void setWidthForceRetqlayout(int width);
 	void setInitialHeight(int height) { m_height = height; } /// << Do NEVER use it unless you know what you do!
 	void setX(int x);
 	void setY(int y);
@@ -85,15 +85,15 @@ class Note
 	inline int  width()  { return (isGroup() ? (isColumn() ? 0 : GROUP_WIDTH) : m_width); }
 	inline int  height() { return m_height;           }
 	inline int  bottom() { return m_y + m_height - 1; }
-	QRect rect();
-	QRect resizerRect();
-	QRect visibleRect();
-	void relayoutAt(int x, int y, bool animate);
+	TQRect rect();
+	TQRect resizerRect();
+	TQRect visibleRect();
+	void retqlayoutAt(int x, int y, bool animate);
 	int contentX();
 	int minWidth();
 	int minRight();
 	void unsetWidth();
-	void requestRelayout();
+	void requestRetqlayout();
 	void setHeight(int height) { m_height = height; } /// << DO NEVER USE IT!!! Only available when moving notes, groups should be recreated with the exact same state as before!
 
 /// FREE AND COLUMN LAYOUTS MANAGEMENT:
@@ -118,7 +118,7 @@ class Note
 	inline bool isGroup()                 { return m_content == 0L;  }
 	inline bool isFolded()                { return m_isFolded;       }
 	inline Note* firstChild()             { return m_firstChild;     }
-	inline Note* parentNote()             { return m_parentNote;     }
+	inline Note* tqparentNote()             { return m_parentNote;     }
 	/*inline*/ bool showSubNotes();//            { return !m_isFolded || !m_collapseFinished; }
 	inline void setParentNote(Note *note) { m_parentNote = note;     }
 	inline void setFirstChild(Note *note) { m_firstChild = note;     }
@@ -131,25 +131,25 @@ class Note
 	Note* lastSibling();
 	int   yExpander();
 	bool  isAfter(Note *note);
-	bool  contains(Note *note);
+	bool  tqcontains(Note *note);
 
 /// NOTES VARIOUS PROPERTIES:       // CONTENT MANAGEMENT?
   private:
 	Basket      *m_basket;
 	NoteContent *m_content;
-	QDateTime    m_addedDate;
-	QDateTime    m_lastModificationDate;
+	TQDateTime    m_addedDate;
+	TQDateTime    m_lastModificationDate;
   public:
 	inline Basket*      basket()  { return m_basket;  }
 	inline NoteContent* content() { return m_content; }
-	inline void setAddedDate(const QDateTime &dateTime)            { m_addedDate            = dateTime; }
-	inline void setLastModificationDate(const QDateTime &dateTime) { m_lastModificationDate = dateTime; }
+	inline void setAddedDate(const TQDateTime &dateTime)            { m_addedDate            = dateTime; }
+	inline void setLastModificationDate(const TQDateTime &dateTime) { m_lastModificationDate = dateTime; }
 	inline void setParentBasket(Basket *basket) { m_basket = basket; }
-	QDateTime addedDate()            { return m_addedDate;            }
-	QDateTime lastModificationDate() { return m_lastModificationDate; }
-	QString addedStringDate();
-	QString lastModificationStringDate();
-	QString toText(const QString &cuttedFullPath);
+	TQDateTime addedDate()            { return m_addedDate;            }
+	TQDateTime lastModificationDate() { return m_lastModificationDate; }
+	TQString addedStringDate();
+	TQString lastModificationStringDate();
+	TQString toText(const TQString &cuttedFullPath);
 	bool saveAgain();
 	void deleteChilds();
 
@@ -160,26 +160,26 @@ class Note
 
 /// DRAWING:
   private:
-	QPixmap m_bufferedPixmap;
+	TQPixmap m_bufferedPixmap;
 	KPixmap m_bufferedSelectionPixmap;
   public:
-	void draw(QPainter *painter, const QRect &clipRect);
-	void drawBufferOnScreen(QPainter *painter, const QPixmap &contentPixmap);
-	static void getGradientColors(const QColor &originalBackground, QColor *colorTop, QColor *colorBottom);
-	static void drawExpander(QPainter *painter, int x, int y, const QColor &background, bool expand, Basket *basket);
-	void drawHandle(   QPainter *painter, int x, int y, int width, int height, const QColor &background, const QColor &foreground);
-	void drawResizer(  QPainter *painter, int x, int y, int width, int height, const QColor &background, const QColor &foreground, bool rounded);
-	void drawRoundings(QPainter *painter, int x, int y, int type, int width = 0, int height = 0);
+	void draw(TQPainter *painter, const TQRect &clipRect);
+	void drawBufferOnScreen(TQPainter *painter, const TQPixmap &contentPixmap);
+	static void getGradientColors(const TQColor &originalBackground, TQColor *colorTop, TQColor *colorBottom);
+	static void drawExpander(TQPainter *painter, int x, int y, const TQColor &background, bool expand, Basket *basket);
+	void drawHandle(   TQPainter *painter, int x, int y, int width, int height, const TQColor &background, const TQColor &foreground);
+	void drawResizer(  TQPainter *painter, int x, int y, int width, int height, const TQColor &background, const TQColor &foreground, bool rounded);
+	void drawRoundings(TQPainter *painter, int x, int y, int type, int width = 0, int height = 0);
 	void unbufferizeAll();
 	void bufferizeSelectionPixmap();
 	inline void unbufferize()  { m_bufferedPixmap.resize(0, 0); m_bufferedSelectionPixmap.resize(0, 0); }
 	inline bool isBufferized() { return !m_bufferedPixmap.isNull(); }
-	void recomputeBlankRects(QValueList<QRect> &blankAreas);
-	static void drawInactiveResizer(QPainter *painter, int x, int y, int height, const QColor &background, bool column);
+	void recomputeBlankRects(TQValueList<TQRect> &blankAreas);
+	static void drawInactiveResizer(TQPainter *painter, int x, int y, int height, const TQColor &background, bool column);
 
 /// VISIBLE AREAS COMPUTATION:
   private:
-	QValueList<QRect> m_areas;
+	TQValueList<TQRect> m_areas;
 	bool              m_computedAreas;
 	bool              m_onTop;
 	void recomputeAreas();
@@ -224,10 +224,10 @@ class Note
 	void        setHoveredZone(Zone zone);
 	inline bool hovered()                 { return m_hovered;     }
 	inline Zone hoveredZone()             { return m_hoveredZone; }
-	Zone zoneAt(const QPoint &pos, bool toAdd = false);
-	QRect zoneRect(Zone zone, const QPoint &pos);
+	Zone zoneAt(const TQPoint &pos, bool toAdd = false);
+	TQRect zoneRect(Zone zone, const TQPoint &pos);
 	void setCursor(Zone zone);
-	QString linkAt(const QPoint &pos);
+	TQString linkAt(const TQPoint &pos);
   private:
 	bool m_hovered;
 	Zone m_hoveredZone;
@@ -238,7 +238,7 @@ class Note
 	void setSelected(bool selected);
 	void setSelectedRecursivly(bool selected);
 	void invertSelectionRecursivly();
-	void selectIn(const QRect &rect, bool invertSelection, bool unselectOthers = true);
+	void selectIn(const TQRect &rect, bool invertSelection, bool unselectOthers = true);
 	void setFocused(bool focused);
 	inline bool isFocused()  { return m_focused; }
 	inline bool isSelected() { return m_selected; }
@@ -280,10 +280,10 @@ class Note
 	bool stateForTagFromSelectedNotes(Tag *tag, State **state);
 	void   recomputeStyle();
 	void   recomputeAllStyles();
-	bool   removedStates(const QValueList<State*> &deletedStates);
-	QFont  font(); // Computed!
-	QColor backgroundColor(); // Computed!
-	QColor textColor(); // Computed!
+	bool   removedStates(const TQValueList<State*> &deletedStates);
+	TQFont  font(); // Computed!
+	TQColor backgroundColor(); // Computed!
+	TQColor textColor(); // Computed!
 
 /// FILTERING:
   private:
@@ -299,15 +299,15 @@ class Note
 	int count();
 	int countDirectChilds();
 
-	QString fullPath();
-	Note* noteForFullPath(const QString &path);
+	TQString fullPath();
+	Note* noteForFullPath(const TQString &path);
 
 	void update();
 	void linkLookChanged();
 
-	void usedStates(QValueList<State*> &states);
+	void usedStates(TQValueList<State*> &states);
 
-	void listUsedTags(QValueList<Tag*> &list);
+	void listUsedTags(TQValueList<Tag*> &list);
 
 
 	Note* nextInStack();
@@ -315,7 +315,7 @@ class Note
 	Note* nextShownInStack();
 	Note* prevShownInStack();
 
-	Note* parentPrimaryNote(); // TODO: There are places in the code where this methods is hand-copied / hand-inlined instead of called.
+	Note* tqparentPrimaryNote(); // TODO: There are places in the code where this methods is hand-copied / hand-inlined instead of called.
 
 	Note* firstSelected();
 	Note* lastSelected();