Rename old tq methods that no longer need a unique name

1 files changed, 12 insertions, 12 deletions

diff --git a/src/notecontent.h b/src/notecontent.h
index 40bb1d9..bc71876 100644
--- a/src/notecontent.h
+++ b/src/notecontent.h
@@ -83,7 +83,7 @@ class NoteContent // TODO: Mark some methods as const!             and some (lik
 	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 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().
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -312,10 +312,10 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a
   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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();