TDE
/
tdebase
9
4
Fork 1
Code Issues 115 Pull Requests 10 Releases Wiki Activity

Rename a few build variables for overall consistency

Browse Source
pull/2/head
Timothy Pearson 11 years ago
parent 3b20716d47
commit 23cc597c60
16 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
doc/tdm/tdmrc-ref.docbook
Unescape View File

@ -2265,7 +2265,7 @@ the following environment variables are passed:</para>
<listitem><para>may be set to a non-standard authority file</para></listitem>
</varlistentry>
<varlistentry>
<term>KRBTKFILE</term>
<term>KRBTTDEFILE</term>
<listitem><para>may be set to a Kerberos4 credentials cache name</para>
</listitem>
</varlistentry>

2
kcontrol/background/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_background.la
kcm_background_la_SOURCES = main.cpp
kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_KFILE) $(LIB_KNEWSTUFF)
kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_TDEFILE) $(LIB_KNEWSTUFF)
METASOURCES = AUTO

4
kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
Unescape View File

@ -1,5 +1,5 @@
#ifndef __KFILE_FONT_ICON_VIEW_H__
#define __KFILE_FONT_ICON_VIEW_H__
#ifndef __TDEFILE_FONT_ICON_VIEW_H__
#define __TDEFILE_FONT_ICON_VIEW_H__
////////////////////////////////////////////////////////////////////////////////
//

4
kcontrol/kfontinst/kcmfontinst/KFileFontView.h
Unescape View File

@ -1,5 +1,5 @@
#ifndef __KFILE_FONT_VIEW_H__
#define __KFILE_FONT_VIEW_H__
#ifndef __TDEFILE_FONT_VIEW_H__
#define __TDEFILE_FONT_VIEW_H__
////////////////////////////////////////////////////////////////////////////////
//

4
kcontrol/kfontinst/tdefile-plugin/KFileFont.h
Unescape View File

@ -1,5 +1,5 @@
#ifndef __KFILE_FONT_H__
#define __KFILE_FONT_H__
#ifndef __TDEFILE_FONT_H__
#define __TDEFILE_FONT_H__
////////////////////////////////////////////////////////////////////////////////
//

2
kcontrol/randr/Makefile.am
Unescape View File

@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray
tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
tderandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR)
tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tderandr.pot

4
kcontrol/randr/tderandrapp.h
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KRANDRAPP_H
#define KRANDRAPP_H
#ifndef TDERANDRAPP_H
#define TDERANDRAPP_H
#include <tqtimer.h>
#include <kuniqueapplication.h>

4
kcontrol/randr/tderandrmodule.h
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KRANDRMODULE_H
#define KRANDRMODULE_H
#ifndef TDERANDRMODULE_H
#define TDERANDRMODULE_H
#include <libtderandr/libtderandr.h>

4
kcontrol/randr/tderandrtray.h
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KRANDRTRAY_H
#define KRANDRTRAY_H
#ifndef TDERANDRTRAY_H
#define TDERANDRTRAY_H
#include <tqptrlist.h>

4
kcontrol/tdm/tdm-appear.cpp
Unescape View File

@ -53,7 +53,7 @@
extern KSimpleConfig *config;
#define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock"
#define TSAK_LOCTDEFILE "/tmp/tdesocket-global/tsak.lock"
TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name), sakwarning(0)
@ -486,7 +486,7 @@ void TDMAppearanceWidget::save()
}
else {
// Get PID
TQFile file(TSAK_LOCKFILE);
TQFile file(TSAK_LOCTDEFILE);
if (file.open(IO_ReadOnly)) {
TQTextStream stream(&file);
unsigned long tsakpid = stream.readLine().toULong();

4
kdesktop/tdefileividesktop.h
Unescape View File

@ -21,8 +21,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef KFILE_IVI_DESKTOP
#define KFILE_IVI_DESKTOP
#ifndef TDEFILE_IVI_DESKTOP
#define TDEFILE_IVI_DESKTOP
#include <tqcolor.h>
#include <tqpixmap.h>

4
tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
Unescape View File

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef _KFILE_MEDIA_H_
#define _KFILE_MEDIA_H_
#ifndef _TDEFILE_MEDIA_H_
#define _TDEFILE_MEDIA_H_
#include <tdefilemetainfo.h>
#include <kurl.h>

4
tdeioslave/trash/tdefile-plugin/tdefile_trash.h
Unescape View File

@ -18,8 +18,8 @@
*
*/
#ifndef __KFILE_TRASH_H_
#define __KFILE_TRASH_H_
#ifndef __TDEFILE_TRASH_H_
#define __TDEFILE_TRASH_H_
#include <tdefilemetainfo.h>
#include "../trashimpl.h"

2
tdm/backend/client.c
Unescape View File

@ -1308,7 +1308,7 @@ StartClient()
env = setEnv (env, "TDM_AUTOLOGIN", curuser);
#if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
if (krbttdefile[0] != '\0')
env = setEnv( env, "KRBTKFILE", krbttdefile );
env = setEnv( env, "KRBTTDEFILE", krbttdefile );
#endif
#ifdef WITH_CONSOLE_KIT
if (ck_session_cookie != NULL) {

2
tdm/config.def
Unescape View File

@ -632,7 +632,7 @@ the following environment variables are passed:</para>
<listitem><para>may be set to a non-standard authority file</para></listitem>
</varlistentry>
<varlistentry>
<term>KRBTKFILE</term>
<term>KRBTTDEFILE</term>
<listitem><para>may be set to a Kerberos4 credentials cache name</para>
</listitem>
</varlistentry>

12
tsak/main.cpp
Unescape View File

@ -45,7 +45,7 @@ using namespace std;
#define FIFO_DIR "/tmp/tdesocket-global"
#define FIFO_FILE_OUT "/tmp/tdesocket-global/tsak"
#define FIFO_LOCKFILE_OUT "/tmp/tdesocket-global/tsak.lock"
#define FIFO_LOCTDEFILE_OUT "/tmp/tdesocket-global/tsak.lock"
// WARNING
// MAX_KEYBOARDS must be greater than or equal to MAX_INPUT_NODE
@ -266,7 +266,7 @@ void tearDownPipe()
void tearDownLockingPipe()
{
close(mPipe_lockfd_out);
unlink(FIFO_LOCKFILE_OUT);
unlink(FIFO_LOCTDEFILE_OUT);
}
bool setFileLock(int fd, bool close_on_failure)
@ -296,7 +296,7 @@ bool checkFileLock()
fl.l_whence = SEEK_SET;
fl.l_len = 0;
int fd = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK);
int fd = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK);
fcntl(fd, F_GETLK, &fl); /* Overwrites lock structure with preventors. */
if (fd > -1) {
@ -333,10 +333,10 @@ bool setupLockingPipe(bool writepid)
umask(0);
mkdir(FIFO_DIR,0644);
mknod(FIFO_LOCKFILE_OUT, 0600, 0);
chmod(FIFO_LOCKFILE_OUT, 0600);
mknod(FIFO_LOCTDEFILE_OUT, 0600, 0);
chmod(FIFO_LOCTDEFILE_OUT, 0600);
mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK);
mPipe_lockfd_out = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK);
if (mPipe_lockfd_out > -1) {
if (writepid) {
// Write my PID to the file

Write Preview
Loading…
Cancel
Save