From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:47 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 ksirc/KSPrefs/page_autoconnect.cpp    |  2 +-
 ksirc/KSPrefs/page_autoconnectbase.ui |  2 +-
 ksirc/KSPrefs/page_font.h             |  2 +-
 ksirc/KSTicker/ksticker.cpp           |  2 +-
 ksirc/ahistlineedit.cpp               |  4 +-
 ksirc/chanButtons.cpp                 |  2 +-
 ksirc/dccManager.h                    |  2 +-
 ksirc/dccManagerbase.ui               |  2 +-
 ksirc/dccToplevel.cpp                 |  2 +-
 ksirc/dccToplevel.h                   |  2 +-
 ksirc/default.pl                      |  6 +--
 ksirc/displayMgrMDI.cpp               |  4 +-
 ksirc/dockservercontroller.cpp        |  4 +-
 ksirc/ksview.cpp                      |  2 +-
 ksirc/mditoplevel.cpp                 |  4 +-
 ksirc/mditoplevel.h                   |  2 +-
 ksirc/servercontroller.cpp            |  8 ++--
 ksirc/servercontroller.h              |  4 +-
 ksirc/test/nicklist.pl                | 77 +++++++++++++++++++++++++++++++++++
 ksirc/test/nictdelist.pl              | 77 -----------------------------------
 ksirc/topic.cpp                       |  2 +-
 ksirc/toplevel.cpp                    |  6 +--
 ksirc/toplevel.h                      |  2 +-
 23 files changed, 110 insertions(+), 110 deletions(-)
 create mode 100644 ksirc/test/nicklist.pl
 delete mode 100644 ksirc/test/nictdelist.pl

(limited to 'ksirc')

diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 964a4acd..86a78c6d 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -12,7 +12,7 @@
 
 #include <tqregexp.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui
index 664bf30f..ff220588 100644
--- a/ksirc/KSPrefs/page_autoconnectbase.ui
+++ b/ksirc/KSPrefs/page_autoconnectbase.ui
@@ -387,7 +387,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h
index 154ff014..ae910a2d 100644
--- a/ksirc/KSPrefs/page_font.h
+++ b/ksirc/KSPrefs/page_font.h
@@ -1,6 +1,6 @@
 #ifndef _PAGE_FONT
 #define _PAGE_FONT
-#include <kfontdialog.h> // For the font selection widget
+#include <tdefontdialog.h> // For the font selection widget
 #include <tqlayout.h> // For the tqlayout
 #include "ksopts.h"  // For storing the info.
 
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 60e137bf..4e9891cb 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -7,7 +7,7 @@
 #include <tqregexp.h>
 
 #include <kapplication.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <klocale.h>
 
 #include "ksticker.h"
diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp
index f741646f..1eb0df88 100644
--- a/ksirc/ahistlineedit.cpp
+++ b/ksirc/ahistlineedit.cpp
@@ -51,8 +51,8 @@
 #include <tqpainter.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kstdaccel.h>
-#include <kshortcut.h>
+#include <tdestdaccel.h>
+#include <tdeshortcut.h>
 
 
 aHistLineEdit::aHistLineEdit(TQWidget *parent, const char *name)
diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index ad56d000..7f841450 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -4,7 +4,7 @@
 #include "chanButtons.moc"
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
diff --git a/ksirc/dccManager.h b/ksirc/dccManager.h
index 519c0dca..151152f5 100644
--- a/ksirc/dccManager.h
+++ b/ksirc/dccManager.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 
 #include "dccManagerbase.h"
-#include "klistview.h"
+#include "tdelistview.h"
 
 
 class dccManager;
diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui
index 7c768f47..70d21bb5 100644
--- a/ksirc/dccManagerbase.ui
+++ b/ksirc/dccManagerbase.ui
@@ -192,7 +192,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp
index e5288290..d03543c0 100644
--- a/ksirc/dccToplevel.cpp
+++ b/ksirc/dccToplevel.cpp
@@ -2,7 +2,7 @@
 #include <tqvbox.h>
 #include <tqpopupmenu.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/ksirc/dccToplevel.h b/ksirc/dccToplevel.h
index d7a64341..fe4f6992 100644
--- a/ksirc/dccToplevel.h
+++ b/ksirc/dccToplevel.h
@@ -2,7 +2,7 @@
 #ifndef _DCCTOPLEVEL_H_
 #define _DCCTOPLEVEL_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class dccManager;
 
diff --git a/ksirc/default.pl b/ksirc/default.pl
index 7b42dd18..e253f1e9 100644
--- a/ksirc/default.pl
+++ b/ksirc/default.pl
@@ -428,12 +428,12 @@ sub cmd_fk {
   $n0thing_kickpat=$newarg;
   &slashify($n0thing_kickpat);
   $n0thing_kickmsg=$args || "though names may change each face retains the mask it wore";
-  &addhook("352", "dofklist");
+  &addhook("352", "doftdelist");
   &addhook("315", "donefk");
   &sl("WHO $talkchannel");
 }
 &addcmd("fk");
-sub hook_dofklist {
+sub hook_doftdelist {
   local($a)=@_;
   local($c, $c, $u, $h, $s, $n)=split(/ +/, $a);
   (($n."!".$u."\@".$h) =~ /${n0thing_kickpat}/i) && $n ne $nick &&
@@ -441,7 +441,7 @@ sub hook_dofklist {
   $silent=1;
 }
 sub hook_donefk {
-  &remhook("352", "dofklist");
+  &remhook("352", "doftdelist");
   &remhook("315", "donefk");
 }
 sub cmd_setaway {
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index ec488275..89e05ad8 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -6,8 +6,8 @@
 #include <assert.h>
 #include <tqpopupmenu.h>
 #include <twin.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index a433c99b..bc7ddc75 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -16,9 +16,9 @@
 #include <tqtimer.h>
 #include <tqcursor.h>
 #include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <twin.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index e093450f..07a06b60 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <krun.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <knotifyclient.h>
 #include <tdefiledialog.h>
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index 55992ccb..334f4ff5 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -7,9 +7,9 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "mditoplevel.h"
 #include "toplevel.h"
diff --git a/ksirc/mditoplevel.h b/ksirc/mditoplevel.h
index 78350561..851834ae 100644
--- a/ksirc/mditoplevel.h
+++ b/ksirc/mditoplevel.h
@@ -4,7 +4,7 @@
 #include <tqptrlist.h>
 #include <tqtabwidget.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KSTabWidget : public TQTabWidget
 {
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 58d46517..baf92e43 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -83,15 +83,15 @@
 
 #include <kmenubar.h>
 #include <tdeconfig.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kiconloader.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstandarddirs.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <knotifydialog.h>
 #include <netwm.h>
 #include <kpassivepopup.h>
@@ -110,7 +110,7 @@
 #endif
 #include <klocale.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 DisplayMgr *displayMgr;
 
diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h
index 7111a458..0eb92375 100644
--- a/ksirc/servercontroller.h
+++ b/ksirc/servercontroller.h
@@ -24,8 +24,8 @@ class ProcCommand;
 #include <tqheader.h>
 #include <tqtimer.h>
 
-#include <klistview.h>
-#include <kmainwindow.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
 
 #include "ksircprocess.h"
 #include "ksircchannel.h"
diff --git a/ksirc/test/nicklist.pl b/ksirc/test/nicklist.pl
new file mode 100644
index 00000000..948429eb
--- /dev/null
+++ b/ksirc/test/nicklist.pl
@@ -0,0 +1,77 @@
+sub rndchr {
+  my $string = "";
+  for(my $i = 0; $i < 8; $i++){
+    $string .= chr(int(rand(26)) + 97); # More or less the alpahbet
+  }
+  return $string;
+}
+
+srand(time());
+
+&timer(1, "&next_one", 1);
+
+$state = 0;
+$max_nicks = 100;
+$min_nicks = 5;
+$num_nicks = 0;
+%list_nicks = ();
+$repeat = 100000;
+$count = 0;
+
+@state = (\&join, \&part);
+
+$line = "~#test~*#* Users on #test:";
+for($i = 0; $i < $max_nicks; $i++){
+  my($mynick) = rndchr();
+  $list_nicks{$mynick} = 1;
+  $is_op = rand(100);
+  if($is_op > 50){
+    $mynick = "@" . $mynick;
+  }
+  $line .= " " . $mynick;
+  $num_nicks ++;
+}
+print "$line\n";
+
+sub next_one {
+  for(my($i) = 0; $i < 200; $i++){
+    $goto_state = int(rand($#state+1));
+    &{$state[$goto_state]};
+  }
+  if($count++ < $repeat){
+    &timer(1, "&next_one", 1);
+  }
+}
+
+sub join{
+  return if $num_nicks > $max_nicks;
+  my($mynick) = rndchr();
+  $list_nicks{$mynick} = 1;
+  print("~#test~*>* $mynick (blah\@blah) has joined channel #test\n");
+  $is_op = rand(100);
+  if($is_op > 75){
+    print "~#test~*+* Mode change \"+o $mynick\" on channel #test by ChanServ\n";
+  }
+  $is_voice = rand(100);
+  if($is_voice > 40){
+    print "~#test~*+* Mode change \"+v $mynick\" on channel #test by ChanServ\n";
+  }
+  $num_nicks ++;
+}
+
+sub part{
+  return if $num_nicks < $min_nicks;
+  AGAIN: {
+    my($times) = int(rand($num_nicks));
+    for($i = 0; $i<= $times; $i++){
+      ($mynick, $value) = each(%list_nicks);
+    }
+    return if $mynick eq '';
+  }
+  next AGAIN if $value != 1;
+  $list_nicks{$mynick} = 0;
+  print("~#test~*<* $mynick has left channel #test\n");
+
+  delete $list_nicks{$mynick};
+  $num_nicks --;
+}
diff --git a/ksirc/test/nictdelist.pl b/ksirc/test/nictdelist.pl
deleted file mode 100644
index 948429eb..00000000
--- a/ksirc/test/nictdelist.pl
+++ /dev/null
@@ -1,77 +0,0 @@
-sub rndchr {
-  my $string = "";
-  for(my $i = 0; $i < 8; $i++){
-    $string .= chr(int(rand(26)) + 97); # More or less the alpahbet
-  }
-  return $string;
-}
-
-srand(time());
-
-&timer(1, "&next_one", 1);
-
-$state = 0;
-$max_nicks = 100;
-$min_nicks = 5;
-$num_nicks = 0;
-%list_nicks = ();
-$repeat = 100000;
-$count = 0;
-
-@state = (\&join, \&part);
-
-$line = "~#test~*#* Users on #test:";
-for($i = 0; $i < $max_nicks; $i++){
-  my($mynick) = rndchr();
-  $list_nicks{$mynick} = 1;
-  $is_op = rand(100);
-  if($is_op > 50){
-    $mynick = "@" . $mynick;
-  }
-  $line .= " " . $mynick;
-  $num_nicks ++;
-}
-print "$line\n";
-
-sub next_one {
-  for(my($i) = 0; $i < 200; $i++){
-    $goto_state = int(rand($#state+1));
-    &{$state[$goto_state]};
-  }
-  if($count++ < $repeat){
-    &timer(1, "&next_one", 1);
-  }
-}
-
-sub join{
-  return if $num_nicks > $max_nicks;
-  my($mynick) = rndchr();
-  $list_nicks{$mynick} = 1;
-  print("~#test~*>* $mynick (blah\@blah) has joined channel #test\n");
-  $is_op = rand(100);
-  if($is_op > 75){
-    print "~#test~*+* Mode change \"+o $mynick\" on channel #test by ChanServ\n";
-  }
-  $is_voice = rand(100);
-  if($is_voice > 40){
-    print "~#test~*+* Mode change \"+v $mynick\" on channel #test by ChanServ\n";
-  }
-  $num_nicks ++;
-}
-
-sub part{
-  return if $num_nicks < $min_nicks;
-  AGAIN: {
-    my($times) = int(rand($num_nicks));
-    for($i = 0; $i<= $times; $i++){
-      ($mynick, $value) = each(%list_nicks);
-    }
-    return if $mynick eq '';
-  }
-  next AGAIN if $value != 1;
-  $list_nicks{$mynick} = 0;
-  print("~#test~*<* $mynick has left channel #test\n");
-
-  delete $list_nicks{$mynick};
-  $num_nicks --;
-}
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 92066916..7238d62f 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <krun.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index a6b7518d..e2530cc9 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -64,7 +64,7 @@
 #include <kdebug.h>
 #include <twin.h>
 #include <knotifyclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
@@ -72,7 +72,7 @@
 #include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <kglobalsettings.h>
 #include <kstdguiitem.h>
@@ -1286,7 +1286,7 @@ void KSircTopLevel::control_message(int command, TQString str)
       }
       setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel");
       pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + TQSPLITTER_OBJECT_NAME_STRING);
-      kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_ktoolframe");
+      kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_tdetoolframe");
       linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter");
       kmenu->show();
       setCaption(m_channelInfo.channel());
diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h
index de5e2a27..a50fc835 100644
--- a/ksirc/toplevel.h
+++ b/ksirc/toplevel.h
@@ -2,7 +2,7 @@
 #define KSIRCTOPLEVEL_H
 
 #include <tqdatetime.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "ahistlineedit.h"
 #include "messageReceiver.h"
-- 
cgit v1.2.3