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

This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index f0e93e21..ce2c5365 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -34,7 +34,7 @@
 
 
 
-// Tables used in $setAlignment & $alignment
+// Tables used in $tqsetAlignment & $tqalignment
 const char * const align_tbl[] = {
 			"Left", 
 			"Right",
@@ -120,7 +120,7 @@ const int frame_cod[] = {
 		[class]widget[/class]
 	@description:
 		This widget can be used to display a text or an image. It can
-		have different frame styles and text/image alignment.
+		have different frame styles and text/image tqalignment.
 	@functions:
 		!fn: $setText(<text:string>)
 		Sets the text to be displayed by the label.
@@ -144,15 +144,15 @@ const int frame_cod[] = {
 		automagically resize itself accordingly to the 'size' of the
 		text it contains. 
 		See also [classfnc]$autoResize[/classfnc]().
-		!fn: <string> $alignment()
-		Returns a string containing alignment flags that are set for 
+		!fn: <string> $tqalignment()
+		Returns a string containing tqalignment flags that are set for 
 		this label. The flags are separated by commas. An example output
 		could look like this:[br]
 		[pre]Bottom, Right[/pre][br]
-		See [classfnc]$setAlignment[/classfnc]() for explanation of all
-		alignment flags.
-		!fn: $setAlignment(<flag1:string>, <flag2:string>, ...)
-		This function sets alignment flags, given as parameters, for 
+		See [classfnc]$tqsetAlignment[/classfnc]() for explanation of all
+		tqalignment flags.
+		!fn: $tqsetAlignment(<flag1:string>, <flag2:string>, ...)
+		This function sets tqalignment flags, given as parameters, for 
 		this label. Valid flags are:
 		[pre]
 		Right     - Text is aligned to right border[br]
@@ -179,8 +179,8 @@ const int frame_cod[] = {
 		frame-style flags and their explenation.
 		!fn: $setFrameStyle(<flag1>, <flag2>, ...)
 		Sets the frame-style flags to the ones passed as arguments.
-		The flags can either decide of the shape or shadow of the
-		label's frame. Valid shape flags are:[br]
+		The flags can either decide of the tqshape or shadow of the
+		label's frame. Valid tqshape flags are:[br]
 		[pre]
 		NoFrame     - draw no frame. You shouldn't specify a shadow when
 		using this.[br]
@@ -216,8 +216,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget")
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setMargin", functionSetMargin)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize)
-	KVSO_REGISTER_HANDLER(KviKvsObject_label,"alignment", functionAlignment)
-	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAlignment", functionSetAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqalignment", functionAlignment)
+	KVSO_REGISTER_HANDLER(KviKvsObject_label,"tqsetAlignment", functionSetAlignment)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"frameStyle", functionFrameStyle)
 	KVSO_REGISTER_HANDLER(KviKvsObject_label,"setFrameStyle", functionSetFrameStyle)
@@ -297,13 +297,13 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c)
 //
 bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
 {
-	TQStringList alignment;
+	TQStringList tqalignment;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment)
+		KVSO_PARAMETER("tqalignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,tqalignment)
 	KVSO_PARAMETERS_END(c)
 	if (!widget()) return true;
 	int align,sum=0;
-	for ( TQStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it )
+	for ( TQStringList::Iterator it = tqalignment.begin(); it != tqalignment.end(); ++it )
 		{
 		
 			align = 0;
@@ -318,15 +318,15 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
 			if(align)
 				sum = sum | align;
 			else
-				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
+				c->warning(__tr2qs("Unknown tqalignment: '%Q'"),&(*it));
 			
 		}
-	((TQLabel *)widget())->setAlignment(sum);
+	((TQLabel *)widget())->tqsetAlignment(sum);
 	return true;
 }
 bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c)
 {
-	int mode = ((TQLabel *)widget())->alignment();
+	int mode = ((TQLabel *)widget())->tqalignment();
 	TQString szAlignment="";
 	for(unsigned int i = 0; i < align_num; i++)
 	{