diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /ktalkd | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ktalkd')
| -rw-r--r-- | ktalkd/ChangeLog | 2 | ||||
| -rw-r--r-- | ktalkd/ktalkd/readcfg++.cpp | 4 | ||||
| -rw-r--r-- | ktalkd/ktalkd/talkd.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog index 775b08a1..e5ee3d5d 100644 --- a/ktalkd/ChangeLog +++ b/ktalkd/ChangeLog @@ -17,7 +17,7 @@ 2000-03-04 David Faure <faure@kde.org> - * talkd.cpp, ktalkdrc: Some fixes for KDE2 (KInstance, kvt->konsole... + * talkd.cpp, ktalkdrc: Some fixes for KDE2 (TDEInstance, kvt->konsole... 2000-03-04 David Smith <dsmith@algonet.se> diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index 115554d3..02115bea 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -91,12 +91,12 @@ int init_user_config(const char * l_name) struct stat buf; TQString cfgFileName, tkannFileName; - /* Set $HOME, because KInstance uses it */ + /* Set $HOME, because TDEInstance uses it */ setenv("HOME",pw->pw_dir,1 /* overwrite */); unsetenv("TDEHOME"); unsetenv("XAUTHORITY"); ktalk_debug("%s",pw->pw_dir); - KInstance tmpInstance("tmpInstance"); + TDEInstance tmpInstance("tmpInstance"); cfgFileName = locateLocal("config", "ktalkdrc", &tmpInstance ); tkannFileName = locateLocal("config", "ktalkannouncerc", &tmpInstance); endpwent(); diff --git a/ktalkd/ktalkd/talkd.cpp b/ktalkd/ktalkd/talkd.cpp index 0bd156f4..76355121 100644 --- a/ktalkd/ktalkd/talkd.cpp +++ b/ktalkd/ktalkd/talkd.cpp @@ -350,7 +350,7 @@ main(int argc, char *argv[]) socklen_t sz = sizeof(sn); int do_debug=0, do_badpackets=0, ch; - new KInstance("ktalkd"); // for KConfig and friends + new TDEInstance("ktalkd"); // for KConfig and friends ktable = new KTalkdTable(); /* make sure we're a daemon */ |