TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a few build variables for overall consistency

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 2175556075
commit b0cf06e104
13 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -112,7 +112,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} ) option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} )
option( BUILD_KDICT "Build kdict" ${BUILD_ALL} ) option( BUILD_KDICT "Build kdict" ${BUILD_ALL} )
option( BUILD_KDNSSD "Build tdednssd" ${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_KGET "Build kget" ${BUILD_ALL} )
option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} ) option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} )
option( BUILD_KOPETE "Build kopete" ${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_FILESHARING filesharing )
tde_conditional_add_subdirectory( BUILD_KDICT kdict ) tde_conditional_add_subdirectory( BUILD_KDICT kdict )
tde_conditional_add_subdirectory( BUILD_KDNSSD tdednssd ) 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_KGET kget )
tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker ) tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker )
tde_conditional_add_subdirectory( BUILD_KOPETE kopete ) tde_conditional_add_subdirectory( BUILD_KOPETE kopete )

2
kdict/Makefile.am
Unescape Escape View File

@ -12,7 +12,7 @@ tdeinit_LTLIBRARIES = kdict.la
AM_CPPFLAGS = $(all_includes) AM_CPPFLAGS = $(all_includes)
kdict_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) 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 \ kdict_la_SOURCES = dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp \
queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp

2
kget/Makefile.am
Unescape Escape View File

@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kget bin_PROGRAMS = kget
kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT) 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 \ kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
transfer.cpp settings.cpp logwindow.cpp \ transfer.cpp settings.cpp logwindow.cpp \
kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \ kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \

2
kppp/logview/Makefile.am
Unescape Escape View File

@ -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, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # 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 # 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 noinst_HEADERS = export.h loginfo.h log.h monthly.h main.h

4
kppp/pppdata.cpp
Unescape Escape View File

@ -610,12 +610,12 @@ void PPPData::setModemEscapeGuardTime(int n) {
bool PPPData::modemLockFile() { bool PPPData::modemLockFile() {
return readNumConfig(cmodemgroup, LOCKFILE_KEY, 1); return readNumConfig(cmodemgroup, LOCTDEFILE_KEY, 1);
} }
void PPPData::setModemLockFile(bool set) { void PPPData::setModemLockFile(bool set) {
writeConfig(cmodemgroup, LOCKFILE_KEY, set); writeConfig(cmodemgroup, LOCTDEFILE_KEY, set);
} }

2
kppp/pppdata.h
Unescape Escape View File

@ -79,7 +79,7 @@ class TDEConfig;
// modem // modem
#define MOD_NAME_KEY "Name" #define MOD_NAME_KEY "Name"
#define MODEMDEV_KEY "Device" #define MODEMDEV_KEY "Device"
#define LOCKFILE_KEY "UseLockFile" #define LOCTDEFILE_KEY "UseLockFile"
#define FLOWCONTROL_KEY "FlowControl" #define FLOWCONTROL_KEY "FlowControl"
#define SPEED_KEY "Speed" #define SPEED_KEY "Speed"
#define TIMEOUT_KEY "Timeout" #define TIMEOUT_KEY "Timeout"

6
ksirc/puke/commands-perl.pl
Unescape Escape View File

@ -526,9 +526,9 @@ $PUKE_NUM2NAME{'15'} = 'PWIDGET_KSIRCLISTBOX';
$PWIDGET_TABDIALOG = 16; $PWIDGET_TABDIALOG = 16;
$PUKE_NAME2NUM{'PWIDGET_TABDIALOG'} = 16; $PUKE_NAME2NUM{'PWIDGET_TABDIALOG'} = 16;
$PUKE_NUM2NAME{'16'} = 'PWIDGET_TABDIALOG'; $PUKE_NUM2NAME{'16'} = 'PWIDGET_TABDIALOG';
$PWIDGET_KFILEDIALOG = 17; $PWIDGET_TDEFILEDIALOG = 17;
$PUKE_NAME2NUM{'PWIDGET_KFILEDIALOG'} = 17; $PUKE_NAME2NUM{'PWIDGET_TDEFILEDIALOG'} = 17;
$PUKE_NUM2NAME{'17'} = 'PWIDGET_KFILEDIALOG'; $PUKE_NUM2NAME{'17'} = 'PWIDGET_TDEFILEDIALOG';
$PWIDGET_OBJFINDER = 18; $PWIDGET_OBJFINDER = 18;
$PUKE_NAME2NUM{'PWIDGET_OBJFINDER'} = 18; $PUKE_NAME2NUM{'PWIDGET_OBJFINDER'} = 18;
$PUKE_NUM2NAME{'18'} = 'PWIDGET_OBJFINDER'; $PUKE_NUM2NAME{'18'} = 'PWIDGET_OBJFINDER';

2
ksirc/puke/commands.h
Unescape Escape View File

@ -986,7 +986,7 @@
// PKFileDialog // PKFileDialog
#define PWIDGET_KFILEDIALOG 17 #define PWIDGET_TDEFILEDIALOG 17
// PObjFinder // PObjFinder

2
ksirc/puke/controller.cpp
Unescape Escape View File

@ -455,7 +455,7 @@ void PukeController::initHdlr()
wc = new widgetCreate; wc = new widgetCreate;
wc->wc = PKFileDialog::createWidget; wc->wc = PKFileDialog::createWidget;
widgetCF.insert(PWIDGET_KFILEDIALOG, wc); widgetCF.insert(PWIDGET_TDEFILEDIALOG, wc);
wc = new widgetCreate; wc = new widgetCreate;
wc->wc = PObjFinder::createWidget; wc->wc = PObjFinder::createWidget;

4
ksirc/puke/ptdefiledialog-cmd.h
Unescape Escape View File

@ -1,5 +1,5 @@
#ifndef PKFILEDIALOG_CMD_H #ifndef PTDEFILEDIALOG_CMD_H
#define PKFILEDIALOG_CMD_H #define PTDEFILEDIALOG_CMD_H
/* /*
* We get 2200 * We get 2200

4
ksirc/puke/ptdefiledialog.h
Unescape Escape View File

@ -1,5 +1,5 @@
#ifndef PKFILEDIALOG_H #ifndef PTDEFILEDIALOG_H
#define PKFILEDIALOG_H #define PTDEFILEDIALOG_H
class PKFileDialog; class PKFileDialog;

4
ksirc/puke/ptdefiledialog.pm
Unescape Escape View File

@ -1,7 +1,7 @@
&::PukeSendMessage($PUKE_WIDGET_LOAD, &::PukeSendMessage($PUKE_WIDGET_LOAD,
$::PUKE_CONTROLLER, $::PUKE_CONTROLLER,
$PWIDGET_KFILEDIALOG, $PWIDGET_TDEFILEDIALOG,
"ptdefiledialog.so", "ptdefiledialog.so",
sub { my %ARG = %{shift()}; sub { my %ARG = %{shift()};
if($ARG{'iArg'} == 1){ if($ARG{'iArg'} == 1){
@ -20,7 +20,7 @@ sub new {
my $class = shift; my $class = shift;
my $self = $class->SUPER::new($class, @_); my $self = $class->SUPER::new($class, @_);
$self->{widgetType} = $::PWIDGET_KFILEDIALOG; $self->{widgetType} = $::PWIDGET_TDEFILEDIALOG;
if($class eq 'PKFileDialog'){ if($class eq 'PKFileDialog'){
$self->create(); $self->create();

6
tdefile-plugins/torrent/tdefile_torrent.h
Unescape Escape View File

@ -16,8 +16,8 @@
* If not, write to the Free Software Foundation, Inc., * If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef _KFILE_TORRENT_H #ifndef _TDEFILE_TORRENT_H
#define _KFILE_TORRENT_H #define _TDEFILE_TORRENT_H
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>
@ -80,6 +80,6 @@ class KTorrentPlugin : public KFilePlugin
BDict *m_dict; BDict *m_dict;
}; };
#endif /* _KFILE_TORRENT_H */ #endif /* _TDEFILE_TORRENT_H */
// vim: set et ts=4 sw=4: // vim: set et ts=4 sw=4:

Write Preview
Loading…
Cancel
Save