Rename obsolete tq methods to standard names

10 files changed, 35 insertions, 35 deletions

diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index 8cae9c86..c6bf8136 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -11,7 +11,7 @@ under Linux.
 Puke's a generic protocol allowing dsirc to communicate with ksirc.
 Communications works over a unix domain socket between multiple
 client dsirc process's to a single ksirc process.  All communications
-is done via a variable length message with the following tqlayout:
+is done via a variable length message with the following layout:
 
 =begin text
 
@@ -68,17 +68,17 @@ supporting perl5-oop object.
 
 The C++ code must be able to hand all required settings and messages
 for the widget.  Each new widget iherites it's parent and so forth
-allowing for a nice oop tqlayout.  The widget structure the author is
+allowing for a nice oop layout.  The widget structure the author is
 following is the same as Qt's.  Their seems to work well, why
 re-invent the wheel?
 
 =item 2.1.1 General Layout, etc
 
 Figure where your new widget goes in the heirachy.  If it's a simple
-Qt widget, I recommend using their existing tqlayout.  Man pages list
+Qt widget, I recommend using their existing layout.  Man pages list
 what widgets inherit what.
 
-The general idea behind the widget tqlayout should be to be to provide
+The general idea behind the widget layout should be to be to provide
 all the functionality of the widget to dsirc perl script.  Incoming
 messages are handled via the messageHandler and ALL messages should
 return an ACK with current state info.
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index fc7f0f0d..ead9fb07 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -993,14 +993,14 @@
 #define PWIDGET_OBJFINDER 18
 
 
-// Group tqlayout commands exist between 10000 and 11000
+// Group layout commands exist between 10000 and 11000
 
-// Desc: create new box tqlayout
+// Desc: create new box layout
 // iWinId: PWidget parent
 // iArg: 2 shorts, short[0] direction, short[1] border
 // cArg: random character string
 #define PUKE_LAYOUT_NEW 11000
-// Desc: ack for box tqlayout
+// Desc: ack for box layout
 // iWinId: Layout ID.
 // iArg: not define
 // cArg: same random m character string as PUKE_LAYOUT_NEW
@@ -1009,7 +1009,7 @@
 #define PUKE_LAYOUT_ADDLAYOUT 11005
 #define PUKE_LAYOUT_ADDLAYOUT_ACK -11005
 
-// Desc: add widget into tqlayout manager
+// Desc: add widget into layout manager
 // iWinId: Layout Manager to add widget too
 // iArg: Widget Id to be added
 // cArg: 2 characters, char[0] strech, char[1] alignment
@@ -1032,7 +1032,7 @@
 // cArg: not define
 #define PUKE_LAYOUT_ADDSTRUT_ACK -11015
 
-// Desc: activates tqlayout management, like show() for widget
+// Desc: activates layout management, like show() for widget
 // iWinId: Layout Manager to activate
 // iArg: undef
 // cArg: undef
diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm
index 410437e7..65bc1b07 100644
--- a/ksirc/puke/dcc_status.pm
+++ b/ksirc/puke/dcc_status.pm
@@ -6,7 +6,7 @@
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
 &docommand("/load pbutton.pm");;
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm
index 048eb9eb..26594c0f 100644
--- a/ksirc/puke/load_all.pm
+++ b/ksirc/puke/load_all.pm
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm"); 
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm
index 9896fd1c..505ddc0d 100644
--- a/ksirc/puke/pboxlayout.pm
+++ b/ksirc/puke/pboxlayout.pm
@@ -40,7 +40,7 @@ sub new {
   #}
   #  else{
   if(ref($widget) ne ''){
-      #    print "*\cbI\cb* Generic Non-topleve tqlayout type\n";
+      #    print "*\cbI\cb* Generic Non-topleve layout type\n";
     $self->{Parent} = $widget;
     $self->{ParentType} = 'Widget';
     $self->{Direction} = shift;
@@ -99,7 +99,7 @@ sub addWidget {
   my $align = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add widget without first being added to parent tqlayout\n";
+    print "*E* Burp: Can't add widget without first being added to parent layout\n";
     return;
   }
 
@@ -128,41 +128,41 @@ sub addLayout {
   my $self = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n";
+    print "*E* Burp: Can't add layout without first being added to parent layout\n";
   }
 
   
-  my $tqlayout = shift;
-  if(ref($tqlayout) ne 'PBoxLayout'){
-    print "*E* Passed non tqlayout type to addLayout\n";
+  my $layout = shift;
+  if(ref($layout) ne 'PBoxLayout'){
+    print "*E* Passed non layout type to addLayout\n";
     return 1;
   }
 
-  if($tqlayout->{iWinId} <= 0){
-    print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n";
+  if($layout->{iWinId} <= 0){
+    print "*E* Trying to add invalid layout " . ref($layout) . "\n";
     return;
   }
 
 
   # make sure we can run, and the widget we want to add can run.
-  #  my @ARG = ($tqlayout);
+  #  my @ARG = ($layout);
   #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
-  #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
+  #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
 
   my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT,
                                  'iWinId' => $self->{iWinId},
-                                 'iArg' => $tqlayout->{iWinId},
+                                 'iArg' => $layout->{iWinId},
                                  'cArg' => pack("C", 0),
                                  'CallBack' => sub { },
                                  'WaitFor' => 1);
 
-  #  print "*I* Adding tqlayout\n";
+  #  print "*I* Adding layout\n";
   if($REPLY{'iArg'} != 0){
     print "*E* AddLayout call failed\n";
   }
   else{
-    #    print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n";
-    $tqlayout->{Added} = 1;
+    #    print "*I* Added new Layout for " . $layout->{iWinId} . "\n";
+    $layout->{Added} = 1;
   }
 
 }
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index 3dbe5c87..a2b6fbae 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -16,7 +16,7 @@ PLayout::~PLayout()
   //  kdDebug(5008) << "PObject: in destructor" << endl;
   /*
   delete widget();
-  tqlayout = 0;
+  layout = 0;
   setWidget();
   */
 }
@@ -34,12 +34,12 @@ PObject *PLayout::createWidget(CreateArgs &ca)
   if((ca.parent != 0) &&
      (ca.parent->widget()->isWidgetType() == TRUE)){
     qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl;
+    //      kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl;
 
   }
   else{
     qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating tqlayout NO PARENT" << endl;
+    //      kdDebug(5008) << "Creating layout NO PARENT" << endl;
   }
   pw->setWidget(qbl);
   pw->setWidgetId(ca.pwI);
@@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout)
      return;
   }
 
-  tqlayout = (TQBoxLayout *) _layout;
+  layout = (TQBoxLayout *) _layout;
   PObject::setWidget(_layout);
   
 }
 
 TQBoxLayout *PLayout::widget()
 {
-  return tqlayout;
+  return layout;
 }
 
 
-#include "ptqlayout.moc"
+#include "playout.moc"
 
diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h
index 4124cb14..1cc4290f 100644
--- a/ksirc/puke/playout.h
+++ b/ksirc/puke/playout.h
@@ -36,7 +36,7 @@ public:
 
 private:
 
-  TQBoxLayout *tqlayout;
+  TQBoxLayout *layout;
 
 };
 
diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl
index fdeae902..7e7b251d 100644
--- a/ksirc/puke/small.pl
+++ b/ksirc/puke/small.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/test.pl b/ksirc/puke/test.pl
index 369a2dc9..4b4c3169 100644
--- a/ksirc/puke/test.pl
+++ b/ksirc/puke/test.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/user_monitor.ks b/ksirc/puke/user_monitor.ks
index d73fa513..a0b2a56a 100644
--- a/ksirc/puke/user_monitor.ks
+++ b/ksirc/puke/user_monitor.ks
@@ -3,7 +3,7 @@
 &docommand("/load pframe.pm");
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pmenudta.pm");
 &docommand("/load ppopmenu.pm");