Rename a number of old tq methods that are no longer tq specific

1 files changed, 22 insertions, 22 deletions

diff --git a/src/notecontent.h b/src/notecontent.h
index 40bb1d9..52bd636 100644
--- a/src/notecontent.h
+++ b/src/notecontent.h
@@ -82,8 +82,8 @@ class NoteContent // TODO: Mark some methods as const!             and some (lik
 	// Complexe Abstract Generic Methods:
 	virtual void exportToHTML(HTMLExporter *exporter, int indent)    = 0; /// << Export the note in an HTML file.
 	virtual TQString cssClass()                                       = 0; /// << @return the CSS class of the note when exported to HTML
-	virtual int     setWidthAndGetHeight(int width)                  = 0; /// << Retqlayout content with @p width (never less than minWidth()). @return its new height.
-	virtual void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered) = 0; /// << Paint the content on @p painter, at coordinate (0, 0) and with the size (@p width, @p height).
+	virtual int     setWidthAndGetHeight(int width)                  = 0; /// << Relayout content with @p width (never less than minWidth()). @return its new height.
+	virtual void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered) = 0; /// << Paint the content on @p painter, at coordinate (0, 0) and with the size (@p width, @p height).
 	virtual bool    loadFromFile(bool /*lazyLoad*/)     { return false; } /// << Load the content from the file. The default implementation does nothing. @see fileName().
 	virtual bool    finishLazyLoad()                    { return false; } /// << Load what was not loaded by loadFromFile() if it was lazy-loaded
 	virtual bool    saveToFile()                        { return false; } /// << Save the content to the file. The default implementation does nothing. @see fileName().
@@ -131,7 +131,7 @@ class NoteContent // TODO: Mark some methods as const!             and some (lik
   public:
 	void setEdited(); /// << Mark the note as edited NOW: change the "last modification time and time" AND save the basket to XML file.
   protected:
-	void contentChanged(int newMinWidth); /// << When the content has changed, inherited classes should call this to specify its new minimum size and trigger a basket retqlayout.
+	void contentChanged(int newMinWidth); /// << When the content has changed, inherited classes should call this to specify its new minimum size and trigger a basket relayout.
   private:
 	Note    *m_note;
 	TQString  m_fileName;
@@ -163,7 +163,7 @@ class TextContent : public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool lazyLoad);
 	bool    finishLazyLoad();
 	bool    saveToFile();
@@ -176,7 +176,7 @@ class TextContent : public NoteContent
 	TQString messageWhenOpenning(OpenMessage where);
 //	TQString customOpenCommand();
 	// Content-Specific Methods:
-	void    setText(const TQString &text, bool lazyLoad = false); /// << Change the text note-content and retqlayout the note.
+	void    setText(const TQString &text, bool lazyLoad = false); /// << Change the text note-content and relayout the note.
 	TQString text() { return m_text; }     /// << @return the text note-content.
   protected:
 	TQString          m_text;
@@ -206,7 +206,7 @@ class HtmlContent : public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool lazyLoad);
 	bool    finishLazyLoad();
 	bool    saveToFile();
@@ -219,7 +219,7 @@ class HtmlContent : public NoteContent
 	TQString messageWhenOpenning(OpenMessage where);
 	TQString customOpenCommand();
 	// Content-Specific Methods:
-	void    setHtml(const TQString &html, bool lazyLoad = false); /// << Change the HTML note-content and retqlayout the note.
+	void    setHtml(const TQString &html, bool lazyLoad = false); /// << Change the HTML note-content and relayout the note.
 	TQString html() { return m_html; }     /// << @return the HTML note-content.
   protected:
 	TQString          m_html;
@@ -249,7 +249,7 @@ class ImageContent : public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool lazyLoad);
 	bool    finishLazyLoad();
 	bool    saveToFile();
@@ -263,7 +263,7 @@ class ImageContent : public NoteContent
 	TQString messageWhenOpenning(OpenMessage where);
 	TQString customOpenCommand();
 	// Content-Specific Methods:
-	void    setPixmap(const TQPixmap &pixmap); /// << Change the pixmap note-content and retqlayout the note.
+	void    setPixmap(const TQPixmap &pixmap); /// << Change the pixmap note-content and relayout the note.
 	TQPixmap pixmap() { return m_pixmap; }     /// << @return the pixmap note-content.
   protected:
 	TQPixmap  m_pixmap;
@@ -299,7 +299,7 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool lazyLoad);
 	bool    finishLazyLoad();
 	bool    saveToFile();
@@ -307,15 +307,15 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a
 	TQString messageWhenOpenning(OpenMessage where);
 	TQString customOpenCommand();
 	// Content-Specific Methods:
-	bool    setMovie(const TQMovie &movie); /// << Change the movie note-content and retqlayout the note.
+	bool    setMovie(const TQMovie &movie); /// << Change the movie note-content and relayout the note.
 	TQMovie  movie() { return m_movie; }    /// << @return the movie note-content.
   protected slots:
 	void movieUpdated(const TQRect&);
 	void movieResized(const TQSize&);
-	void movietqStatus(int status);
+	void movieStatus(int status);
   protected:
 	TQMovie  m_movie;
-	int     m_oldtqStatus;
+	int     m_oldStatus;
 	static int INVALID_STATUS;
 };
 
@@ -342,7 +342,7 @@ class FileContent : public TQObject, public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool /*lazyLoad*/);
 	void    fontChanged();
 	void    linkLookChanged();
@@ -360,7 +360,7 @@ class FileContent : public TQObject, public NoteContent
 	// Open Content or File:
 	TQString messageWhenOpenning(OpenMessage where);
 	// Content-Specific Methods:
-	void    setFileName(const TQString &fileName); /// << Reimplemented to be able to retqlayout the note.
+	void    setFileName(const TQString &fileName); /// << Reimplemented to be able to relayout the note.
 	virtual LinkLook* linkLook() { return LinkLook::fileLook; }
   protected:
 	LinkDisplay m_linkDisplay;
@@ -430,7 +430,7 @@ class LinkContent : public TQObject, public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	void    saveToNode(TQDomDocument &doc, TQDomElement &content);
 	void    fontChanged();
 	void    linkLookChanged();
@@ -449,7 +449,7 @@ class LinkContent : public TQObject, public NoteContent
 	KURL urlToOpen(bool /*with*/);
 	TQString messageWhenOpenning(OpenMessage where);
 	// Content-Specific Methods:
-	void    setLink(const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon); /// << Change the link and retqlayout the note.
+	void    setLink(const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon); /// << Change the link and relayout the note.
 	KURL    url()       { return m_url;       } /// << @return the URL of the link note-content.
 	TQString title()     { return m_title;     } /// << @return the displayed title of the link note-content.
 	TQString icon()      { return m_icon;      } /// << @return the displayed icon of the link note-content.
@@ -493,7 +493,7 @@ class LauncherContent : public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool /*lazyLoad*/);
 	void    fontChanged();
 	TQString editToolTipText();
@@ -509,7 +509,7 @@ class LauncherContent : public NoteContent
 	KURL urlToOpen(bool with);
 	TQString messageWhenOpenning(OpenMessage where);
 	// Content-Specific Methods:
-	void    setLauncher(const TQString &name, const TQString &icon, const TQString &exec); /// << Change the launcher note-content and retqlayout the note. Normally called by loadFromFile (no save done).
+	void    setLauncher(const TQString &name, const TQString &icon, const TQString &exec); /// << Change the launcher note-content and relayout the note. Normally called by loadFromFile (no save done).
 	TQString name() { return m_name; }                              /// << @return the URL of the launcher note-content.
 	TQString icon() { return m_icon; }                              /// << @return the displayed icon of the launcher note-content.
 	TQString exec() { return m_exec; }                              /// << @return the execute command line of the launcher note-content.
@@ -543,7 +543,7 @@ class ColorContent : public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	void    saveToNode(TQDomDocument &doc, TQDomElement &content);
 	void    fontChanged();
 	TQString editToolTipText();
@@ -554,7 +554,7 @@ class ColorContent : public NoteContent
 	bool    needSpaceForFeedbackPixmap() { return true; }
 	void    addAlternateDragObjects(KMultipleDrag *dragObject);
 	// Content-Specific Methods:
-	void    setColor(const TQColor &color); /// << Change the color note-content and retqlayout the note.
+	void    setColor(const TQColor &color); /// << Change the color note-content and relayout the note.
 	TQColor  color() { return m_color; }    /// << @return the color note-content.
   protected:
 	TQColor  m_color;
@@ -584,7 +584,7 @@ class UnknownContent : public NoteContent
 	void    exportToHTML(HTMLExporter *exporter, int indent);
 	TQString cssClass();
 	int     setWidthAndGetHeight(int width);
-	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &tqcolorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
+	void    paint(TQPainter *painter, int width, int height, const TQColorGroup &colorGroup, bool isDefaultColor, bool isSelected, bool isHovered);
 	bool    loadFromFile(bool /*lazyLoad*/);
 	void    fontChanged();
 	TQString editToolTipText();