summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--kdict/Makefile.am2
-rw-r--r--kget/Makefile.am2
-rw-r--r--kppp/logview/Makefile.am2
-rw-r--r--kppp/pppdata.cpp4
-rw-r--r--kppp/pppdata.h2
-rw-r--r--ksirc/puke/commands-perl.pl6
-rw-r--r--ksirc/puke/commands.h2
-rw-r--r--ksirc/puke/controller.cpp2
-rw-r--r--ksirc/puke/ptdefiledialog-cmd.h4
-rw-r--r--ksirc/puke/ptdefiledialog.h4
-rw-r--r--ksirc/puke/ptdefiledialog.pm4
-rw-r--r--tdefile-plugins/torrent/tdefile_torrent.h6
13 files changed, 22 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 458cd9f2..0977222c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} )
option( BUILD_KDICT "Build kdict" ${BUILD_ALL} )
option( BUILD_KDNSSD "Build tdednssd" ${BUILD_ALL} )
-option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
+option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_KGET "Build kget" ${BUILD_ALL} )
option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} )
option( BUILD_KOPETE "Build kopete" ${BUILD_ALL} )
@@ -150,7 +150,7 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )
tde_conditional_add_subdirectory( BUILD_KDICT kdict )
tde_conditional_add_subdirectory( BUILD_KDNSSD tdednssd )
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
+tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_KGET kget )
tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker )
tde_conditional_add_subdirectory( BUILD_KOPETE kopete )
diff --git a/kdict/Makefile.am b/kdict/Makefile.am
index a65f1a7e..8f945021 100644
--- a/kdict/Makefile.am
+++ b/kdict/Makefile.am
@@ -12,7 +12,7 @@ tdeinit_LTLIBRARIES = kdict.la
AM_CPPFLAGS = $(all_includes)
kdict_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN)
-kdict_la_LIBADD = $(LIB_KFILE) $(LIB_TDEHTML) $(LIBPTHREAD) $(LIBRESOLV)
+kdict_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIBPTHREAD) $(LIBRESOLV)
kdict_la_SOURCES = dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp \
queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp
diff --git a/kget/Makefile.am b/kget/Makefile.am
index 25adb7aa..959334b9 100644
--- a/kget/Makefile.am
+++ b/kget/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kget
kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
-kget_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
+kget_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
transfer.cpp settings.cpp logwindow.cpp \
kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
diff --git a/kppp/logview/Makefile.am b/kppp/logview/Makefile.am
index 67301cd5..13be319f 100644
--- a/kppp/logview/Makefile.am
+++ b/kppp/logview/Makefile.am
@@ -33,7 +33,7 @@ kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE)
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kppplogview_LDADD = -lm $(LIB_TDEUI) $(LIB_KFILE)
+kppplogview_LDADD = -lm $(LIB_TDEUI) $(LIB_TDEFILE)
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = export.h loginfo.h log.h monthly.h main.h
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 29ccb308..5fd1147d 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -610,12 +610,12 @@ void PPPData::setModemEscapeGuardTime(int n) {
bool PPPData::modemLockFile() {
- return readNumConfig(cmodemgroup, LOCKFILE_KEY, 1);
+ return readNumConfig(cmodemgroup, LOCTDEFILE_KEY, 1);
}
void PPPData::setModemLockFile(bool set) {
- writeConfig(cmodemgroup, LOCKFILE_KEY, set);
+ writeConfig(cmodemgroup, LOCTDEFILE_KEY, set);
}
diff --git a/kppp/pppdata.h b/kppp/pppdata.h
index 824665a6..fb72bf0f 100644
--- a/kppp/pppdata.h
+++ b/kppp/pppdata.h
@@ -79,7 +79,7 @@ class TDEConfig;
// modem
#define MOD_NAME_KEY "Name"
#define MODEMDEV_KEY "Device"
-#define LOCKFILE_KEY "UseLockFile"
+#define LOCTDEFILE_KEY "UseLockFile"
#define FLOWCONTROL_KEY "FlowControl"
#define SPEED_KEY "Speed"
#define TIMEOUT_KEY "Timeout"
diff --git a/ksirc/puke/commands-perl.pl b/ksirc/puke/commands-perl.pl
index 1499daa9..7b582d7f 100644
--- a/ksirc/puke/commands-perl.pl
+++ b/ksirc/puke/commands-perl.pl
@@ -526,9 +526,9 @@ $PUKE_NUM2NAME{'15'} = 'PWIDGET_KSIRCLISTBOX';
$PWIDGET_TABDIALOG = 16;
$PUKE_NAME2NUM{'PWIDGET_TABDIALOG'} = 16;
$PUKE_NUM2NAME{'16'} = 'PWIDGET_TABDIALOG';
-$PWIDGET_KFILEDIALOG = 17;
-$PUKE_NAME2NUM{'PWIDGET_KFILEDIALOG'} = 17;
-$PUKE_NUM2NAME{'17'} = 'PWIDGET_KFILEDIALOG';
+$PWIDGET_TDEFILEDIALOG = 17;
+$PUKE_NAME2NUM{'PWIDGET_TDEFILEDIALOG'} = 17;
+$PUKE_NUM2NAME{'17'} = 'PWIDGET_TDEFILEDIALOG';
$PWIDGET_OBJFINDER = 18;
$PUKE_NAME2NUM{'PWIDGET_OBJFINDER'} = 18;
$PUKE_NUM2NAME{'18'} = 'PWIDGET_OBJFINDER';
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index ead9fb07..cc1b2578 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -986,7 +986,7 @@
// PKFileDialog
-#define PWIDGET_KFILEDIALOG 17
+#define PWIDGET_TDEFILEDIALOG 17
// PObjFinder
diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp
index 7d5e85e3..bbcf6de6 100644
--- a/ksirc/puke/controller.cpp
+++ b/ksirc/puke/controller.cpp
@@ -455,7 +455,7 @@ void PukeController::initHdlr()
wc = new widgetCreate;
wc->wc = PKFileDialog::createWidget;
- widgetCF.insert(PWIDGET_KFILEDIALOG, wc);
+ widgetCF.insert(PWIDGET_TDEFILEDIALOG, wc);
wc = new widgetCreate;
wc->wc = PObjFinder::createWidget;
diff --git a/ksirc/puke/ptdefiledialog-cmd.h b/ksirc/puke/ptdefiledialog-cmd.h
index 6aebd59e..610b2aea 100644
--- a/ksirc/puke/ptdefiledialog-cmd.h
+++ b/ksirc/puke/ptdefiledialog-cmd.h
@@ -1,5 +1,5 @@
-#ifndef PKFILEDIALOG_CMD_H
-#define PKFILEDIALOG_CMD_H
+#ifndef PTDEFILEDIALOG_CMD_H
+#define PTDEFILEDIALOG_CMD_H
/*
* We get 2200
diff --git a/ksirc/puke/ptdefiledialog.h b/ksirc/puke/ptdefiledialog.h
index cdf940a8..7b8ebd2e 100644
--- a/ksirc/puke/ptdefiledialog.h
+++ b/ksirc/puke/ptdefiledialog.h
@@ -1,5 +1,5 @@
-#ifndef PKFILEDIALOG_H
-#define PKFILEDIALOG_H
+#ifndef PTDEFILEDIALOG_H
+#define PTDEFILEDIALOG_H
class PKFileDialog;
diff --git a/ksirc/puke/ptdefiledialog.pm b/ksirc/puke/ptdefiledialog.pm
index d91fedca..1b70fe6a 100644
--- a/ksirc/puke/ptdefiledialog.pm
+++ b/ksirc/puke/ptdefiledialog.pm
@@ -1,7 +1,7 @@
&::PukeSendMessage($PUKE_WIDGET_LOAD,
$::PUKE_CONTROLLER,
- $PWIDGET_KFILEDIALOG,
+ $PWIDGET_TDEFILEDIALOG,
"ptdefiledialog.so",
sub { my %ARG = %{shift()};
if($ARG{'iArg'} == 1){
@@ -20,7 +20,7 @@ sub new {
my $class = shift;
my $self = $class->SUPER::new($class, @_);
- $self->{widgetType} = $::PWIDGET_KFILEDIALOG;
+ $self->{widgetType} = $::PWIDGET_TDEFILEDIALOG;
if($class eq 'PKFileDialog'){
$self->create();
diff --git a/tdefile-plugins/torrent/tdefile_torrent.h b/tdefile-plugins/torrent/tdefile_torrent.h
index c954a814..da41177b 100644
--- a/tdefile-plugins/torrent/tdefile_torrent.h
+++ b/tdefile-plugins/torrent/tdefile_torrent.h
@@ -16,8 +16,8 @@
* If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef _KFILE_TORRENT_H
-#define _KFILE_TORRENT_H
+#ifndef _TDEFILE_TORRENT_H
+#define _TDEFILE_TORRENT_H
#include <tdefilemetainfo.h>
@@ -80,6 +80,6 @@ class KTorrentPlugin : public KFilePlugin
BDict *m_dict;
};
-#endif /* _KFILE_TORRENT_H */
+#endif /* _TDEFILE_TORRENT_H */
// vim: set et ts=4 sw=4:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-02 01:02:22 +0000