summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------admin0
-rw-r--r--kopete/kopete/chatwindow/chattexteditpart.cpp2
-rw-r--r--kopete/kopete/chatwindow/krichtexteditpart.cpp2
-rw-r--r--kopete/libkopete/kopete_export.h2
-rw-r--r--kopete/libkopete/kopetecontact.h2
-rw-r--r--kopete/libkopete/kopetemessagehandler.h2
-rw-r--r--kopete/libkopete/kopetemessagehandlerchain.h2
-rw-r--r--kopete/libkopete/kopetemetacontact.h2
-rw-r--r--kopete/libkopete/kopeteonlinestatus.h2
-rw-r--r--kopete/libkopete/kopetepicture.h2
-rw-r--r--kopete/libkopete/kopeteplugin.h2
-rw-r--r--kopete/libkopete/kopetetask.h2
-rw-r--r--kopete/libkopete/kopetewalletmanager.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.h2
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.h2
-rw-r--r--kopete/protocols/msn/Makefile.am2
-rw-r--r--kopete/protocols/msn/dummy.cpp2
-rwxr-xr-xksirc/dsirc45
-rw-r--r--librss/global.h2
20 files changed, 38 insertions, 43 deletions
diff --git a/admin b/admin
-Subproject b770a18e00a82febd12c1787247533771ecbb57
+Subproject 9e0d473a4d6a27fdd3b91e86e1a6358ac233290
diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp
index 1822a96e..3cf32eda 100644
--- a/kopete/kopete/chatwindow/chattexteditpart.cpp
+++ b/kopete/kopete/chatwindow/chattexteditpart.cpp
@@ -107,7 +107,7 @@ KDictSpellingHighlighter* ChatTextEditPart::spellHighlighter()
}
// NAUGHTY, BAD AND WRONG! (but needed to fix nick complete bugs)
-#include <tqrichtext_p.h>
+#include <private/tqrichtext_p.h>
class EvilTextEdit : public KTextEdit
{
public:
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 52f156d3..d9abd633 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -10,7 +10,7 @@
#include <tqclipboard.h>
#include <tqevent.h>
#include <tdeparts/genericfactory.h>
-#include <tqrichtext_p.h>
+#include <private/tqrichtext_p.h>
#include "krichtexteditpart.h"
#include "krichtexteditpart.moc"
diff --git a/kopete/libkopete/kopete_export.h b/kopete/libkopete/kopete_export.h
index 43d76676..54d7afb0 100644
--- a/kopete/libkopete/kopete_export.h
+++ b/kopete/libkopete/kopete_export.h
@@ -18,7 +18,7 @@
#ifndef KOPETE_EXPORT_H
#define KOPETE_EXPORT_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tdeversion.h>
#if KDE_IS_VERSION(3,3,2)
diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h
index cd4ae84d..ad96fe7c 100644
--- a/kopete/libkopete/kopetecontact.h
+++ b/kopete/libkopete/kopetecontact.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopeteglobal.h"
#include "kopete_export.h"
diff --git a/kopete/libkopete/kopetemessagehandler.h b/kopete/libkopete/kopetemessagehandler.h
index e6ecb954..93dc13f8 100644
--- a/kopete/libkopete/kopetemessagehandler.h
+++ b/kopete/libkopete/kopetemessagehandler.h
@@ -18,7 +18,7 @@
#define KOPETEMESSAGEHANDLER_H
#include <tqobject.h>
-//#include <kdemacros.h>
+//#include <tdemacros.h>
#include "kopete_export.h"
//FIXME: Message::MessageDirection could be moved into namespace Kopete
diff --git a/kopete/libkopete/kopetemessagehandlerchain.h b/kopete/libkopete/kopetemessagehandlerchain.h
index 26148285..b4e26c6e 100644
--- a/kopete/libkopete/kopetemessagehandlerchain.h
+++ b/kopete/libkopete/kopetemessagehandlerchain.h
@@ -18,7 +18,7 @@
#define KOPETEFILTERCHAIN_H
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ksharedptr.h>
#include "kopetemessage.h"
#include "kopetetask.h"
diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h
index ca5b3711..6ebfe676 100644
--- a/kopete/libkopete/kopetemetacontact.h
+++ b/kopete/libkopete/kopetemetacontact.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
#include "kopetenotifydataobject.h"
diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h
index 6ad34c55..e0eaae4a 100644
--- a/kopete/libkopete/kopeteonlinestatus.h
+++ b/kopete/libkopete/kopeteonlinestatus.h
@@ -23,7 +23,7 @@
#include "kopete_export.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ksharedptr.h>
#include <tqobject.h>
diff --git a/kopete/libkopete/kopetepicture.h b/kopete/libkopete/kopetepicture.h
index 555787df..b0cea565 100644
--- a/kopete/libkopete/kopetepicture.h
+++ b/kopete/libkopete/kopetepicture.h
@@ -17,7 +17,7 @@
#ifndef KOPETEPICTURE_H
#define KOPETEPICTURE_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <ksharedptr.h>
#include "kopete_export.h"
diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h
index a7de7451..9d17e698 100644
--- a/kopete/libkopete/kopeteplugin.h
+++ b/kopete/libkopete/kopeteplugin.h
@@ -22,7 +22,7 @@
#include <kxmlguiclient.h>
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h
index 9ba9daa8..49435096 100644
--- a/kopete/libkopete/kopetetask.h
+++ b/kopete/libkopete/kopetetask.h
@@ -18,7 +18,7 @@
#define KOPETETASK_H
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace Kopete
{
diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h
index 7e91a3bb..785d0924 100644
--- a/kopete/libkopete/kopetewalletmanager.h
+++ b/kopete/libkopete/kopetewalletmanager.h
@@ -19,7 +19,7 @@
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h
index 3be5df72..ac6f9742 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.h
+++ b/kopete/libkopete/ui/addressbookselectordialog.h
@@ -19,7 +19,7 @@
#ifndef ADDRESSBOOKSELECTORDIALOG_H
#define ADDRESSBOOKSELECTORDIALOG_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
#include <kdialogbase.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index bd49483f..86d71b9a 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -30,7 +30,7 @@
#include <kdialogbase.h>
#include <tdeabc/addressbook.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include "kopete_export.h"
#include "addressbookselectorwidget_base.h"
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h
index c0d4fd1e..d9eabc04 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.h
+++ b/kopete/libkopete/ui/metacontactselectorwidget.h
@@ -18,7 +18,7 @@
#ifndef MetaContactSelectorWidget_H
#define MetaContactSelectorWidget_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tqwidget.h>
#include "kopetelistviewitem.h"
#include "kopete_export.h"
diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am
index 10d05490..1ec33476 100644
--- a/kopete/protocols/msn/Makefile.am
+++ b/kopete/protocols/msn/Makefile.am
@@ -34,7 +34,7 @@ kopete_msn_la_LIBADD = libkopete_msn_shared.la
kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
dummy.cpp: $(srcdir)/Makefile.am
- echo '#include "kdemacros.h"' > $@
+ echo '#include "tdemacros.h"' > $@
echo 'extern "C" TDE_EXPORT void *init_libkopete_msn_shared();' >> $@
echo 'extern "C" TDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }' >> $@
diff --git a/kopete/protocols/msn/dummy.cpp b/kopete/protocols/msn/dummy.cpp
index c1273f3a..30969535 100644
--- a/kopete/protocols/msn/dummy.cpp
+++ b/kopete/protocols/msn/dummy.cpp
@@ -1,3 +1,3 @@
-#include "kdemacros.h"
+#include "tdemacros.h"
extern "C" TDE_EXPORT void *init_libkopete_msn_shared();
extern "C" TDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }
diff --git a/ksirc/dsirc b/ksirc/dsirc
index f358fcd7..d73b6a50 100755
--- a/ksirc/dsirc
+++ b/ksirc/dsirc
@@ -55,8 +55,8 @@
# of ksirc when it started, and found it very flattering that someone
# would write 200k of C++ to interface with my 62k of perl :=)
-$version='2.211';
-$date='10 Mar 1998';
+$version='2.212';
+$date='21 Sep 2024';
$add_ons='';
$libdir=$ENV{"SIRCLIB"} || ".";
@@ -68,12 +68,7 @@ $|=1;
$publicAway = 1;
-if (!eval "require 'getopts.pl';") {
- print "\n\n\
-Your perl interpreter is *really* screwed up: the getopts.pl library is not
-even there! Have you even bothered to run 'install'?\n";
- exit;
-}
+use Getopt::Std;
if ($] >= 5 && (eval "use Socket;", $@ eq '')) {
$sock6 = eval ("require Socket6;") and eval("use Socket6;");
@@ -96,22 +91,22 @@ if($@) {
}
-&Getopts('n:s:p:u:i:l:L:H:rqQR78S');
+getopts('n:s:p:u:i:l:L:H:rqQR78S', \my %opts);
%set=("LOGFILE", "", "LOG", "off", "PRINTUH", "none", "PRINTCHAN", "off",
"LOCALHOST", "", "CTCP", "noflood", "SENDAHEAD", 4096,
"USERINFO", "", "FINGER", "", "IRCNAME", "", "EIGHT_BIT", "on",
"LOADPATH", join(":", @loadpath), "CTRL_T", "/next");
-$raw_mode=$opt_r || (!-t STDOUT);
+$raw_mode=$opts{r} || (!-t STDOUT);
$ansi=!$raw_mode && $ENV{"TERM"} =~ /^vt|^xterm|^ansi/i;
-$server=$opt_s || $ARGV[1] || $ENV{"SIRCSERVER"} || $ENV{"IRCSERVER"} ||
+$server=$opts{s} || $ARGV[1] || $ENV{"SIRCSERVER"} || $ENV{"IRCSERVER"} ||
"irc.primenet.com";
-$port0=$opt_p || $ENV{"SIRCPORT"} || $ENV{"IRCPORT"} || 6667;
-$username=$opt_u || $ENV{"SIRCUSER"} || $ENV{"IRCUSER"} || (getpwuid($<))[0] ||
+$port0=$opts{p} || $ENV{"SIRCPORT"} || $ENV{"IRCPORT"} || 6667;
+$username=$opts{u} || $ENV{"SIRCUSER"} || $ENV{"IRCUSER"} || (getpwuid($<))[0] ||
$ENV{"USER"} || "blah";
-$set{"IRCNAME"}=$opt_i || $ENV{"SIRCNAME"} || $ENV{"IRCNAME"} || "sirc user";
-$nick=$opt_n || $ARGV[0] || $ENV{"SIRCNICK"} || $ENV{"IRCNICK"} || $username;
+$set{"IRCNAME"}=$opts{i} || $ENV{"SIRCNAME"} || $ENV{"IRCNAME"} || "sirc user";
+$nick=$opts{n} || $ARGV[0] || $ENV{"SIRCNICK"} || $ENV{"IRCNICK"} || $username;
$set{"FINGER"}=$ENV{"IRCFINGER"} || "keep your fingers to yourself";
$set{"USERINFO"}=$ENV{"USERINFO"} || "yep, I'm a user";
if ($server =~ /^\[([^\]]+)\]:([0-9]*):?(.*)$/
@@ -123,18 +118,18 @@ $port || ($port=$port0);
$server0=$server1=$server;
$port0=$port1=$port;
$pass0=$pass1=$pass;
-$initfile=$opt_l || $ENV{"SIRCRCPL"} || $ENV{'HOME'}."/.sircrc.pl"
- if $opt_l || !$opt_q;
-$sysinit=$libdir."/sircrc.pl" if $libdir ne '.' && !$opt_Q;
-$rcfile=$opt_L || $ENV{"SIRCRC"} || $ENV{'HOME'}."/.sircrc"
- if $opt_L || !$opt_q;
-$sysrc=$libdir."/sircrc" if $libdir ne '.' && !$opt_Q;
+$initfile=$opts{l} || $ENV{"SIRCRCPL"} || $ENV{'HOME'}."/.sircrc.pl"
+ if $opts{l} || !$opts{q};
+$sysinit=$libdir."/sircrc.pl" if $libdir ne '.' && !$opts{Q};
+$rcfile=$opts{L} || $ENV{"SIRCRC"} || $ENV{'HOME'}."/.sircrc"
+ if $opts{L} || !$opts{q};
+$sysrc=$libdir."/sircrc" if $libdir ne '.' && !$opts{Q};
$set{"LOGFILE"}=$logfile=$ENV{'HOME'}."/sirc.log";
-$opt_8 || ($set{"EIGHT_BIT"}="off");
-$restrict=$opt_R;
-$set{"LOCALHOST"}=$opt_H || $ENV{"SIRCHOST"} || $ENV{"IRCHOST"} ||
+$opts{8} || ($set{"EIGHT_BIT"}="off");
+$restrict=$opts{R};
+$set{"LOCALHOST"}=$opts{H} || $ENV{"SIRCHOST"} || $ENV{"IRCHOST"} ||
$ENV{"LOCALHOST"} || "";
-$SSL=$opt_S;
+$SSL=$opts{S};
@ARGV=(); # ignore any more arguments
diff --git a/librss/global.h b/librss/global.h
index 7d249f3f..c7f89b9d 100644
--- a/librss/global.h
+++ b/librss/global.h
@@ -11,7 +11,7 @@
#ifndef LIBRSS_GLOBAL_H
#define LIBRSS_GLOBAL_H
-#include <kdemacros.h>
+#include <tdemacros.h>
#define LIBRSS_EXPORT TDE_EXPORT
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-04 06:54:08 +0000