summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/CMakeLists.txt4
-rw-r--r--tdecore/MAINTAINERS2
-rw-r--r--tdecore/Makefile.am4
-rw-r--r--tdecore/kglobalaccel_x11.cpp3
-rw-r--r--tdecore/kmountpoint.cpp5
-rw-r--r--tdecore/kpty.cpp11
-rw-r--r--tdecore/tdeapplication.cpp2
-rw-r--r--tdecore/tdecrash.cpp (renamed from tdecore/kcrash.cpp)34
-rw-r--r--tdecore/tdecrash.h (renamed from tdecore/kcrash.h)10
-rw-r--r--tdecore/tdeprocess.cpp5
10 files changed, 30 insertions, 50 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 021d650ae..2b6d4c67e 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES
kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
kregexp.h kcompletion.h kstringhandler.h kstddirs.h
kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
- kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
+ kallocator.h kvmallocator.h tdecrash.h krfcdate.h kinstance.h
kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
@@ -114,7 +114,7 @@ set( ${target}_SRCS
kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
- kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
+ tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
tdeuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 3b4bae7cf..39b3a1424 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -23,7 +23,7 @@ kcompletionbase.cpp
tdeconfig.cpp Waldo Bastian <[email protected]>
tdeconfigbackend.cpp Waldo Bastian <[email protected]>
tdeconfigbase.cpp Waldo Bastian <[email protected]>
-kcrash.cpp Waldo Bastian <[email protected]>
+tdecrash.cpp Waldo Bastian <[email protected]>
kdcoppropertyproxy.cpp
kdebug.cpp Stephan Kulow <[email protected]>
kdesktopfile.cpp
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 35aa6f6f3..924362b3f 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -46,7 +46,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
kregexp.h kcompletion.h kstringhandler.h \
kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
- kallocator.h kvmallocator.h kcrash.h krfcdate.h \
+ kallocator.h kvmallocator.h tdecrash.h krfcdate.h \
kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
krandomsequence.h knotifyclient.h kiconeffect.h \
kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
@@ -98,7 +98,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
- kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
+ tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
tdeuniqueapplication.cpp tdeaccelmanager.cpp \
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 41e58b959..91cc94b74 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -187,12 +187,9 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE
return false;
}
-#ifndef __osf__
-// this crashes under Tru64 so .....
kdDebug(125) << TQString(TQString( "grabKey( key: '%1', bGrab: %2 ): keyCodeX: %3 keyModX: %4\n" )
.arg( key.key().toStringInternal() ).arg( bGrab )
.arg( keyCodeX, 0, 16 ).arg( keyModX, 0, 16 ));
-#endif
if( !keyCodeX ) {
return false;
}
diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp
index e78fc7335..0828911ef 100644
--- a/tdecore/kmountpoint.cpp
+++ b/tdecore/kmountpoint.cpp
@@ -240,12 +240,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
KMountPoint *mp = new KMountPoint();
mp->m_mountedFrom = TQFile::decodeName(mounted[i].f_mntfromname);
mp->m_mountPoint = TQFile::decodeName(mounted[i].f_mntonname);
-
-#ifdef __osf__
- mp->m_mountType = TQFile::decodeName(mnt_names[mounted[i].f_type]);
-#else
mp->m_mountType = TQFile::decodeName(mounted[i].f_fstypename);
-#endif
if (infoNeeded & NeedMountOptions)
{
diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp
index a66705f4d..86f5bfefa 100644
--- a/tdecore/kpty.cpp
+++ b/tdecore/kpty.cpp
@@ -30,11 +30,6 @@
#define __svr4__
#endif
-#ifdef __osf__
-#define _OSF_SOURCE
-#include <float.h>
-#endif
-
#ifdef _AIX
#define _ALL_SOURCE
#endif
@@ -91,11 +86,9 @@ extern "C" {
}
#endif
-#if !defined(__osf__)
-# ifdef HAVE_TERMIO_H
+#ifdef HAVE_TERMIO_H
/* needed at least on AIX */
-# include <termio.h>
-# endif
+# include <termio.h>
#endif
#if defined(HAVE_TCGETATTR)
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index cc5410d7a..7d18d3ba9 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -80,7 +80,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <tdeglobalsettings.h>
-#include <kcrash.h>
+#include <tdecrash.h>
#include <kdatastream.h>
#include <klibloader.h>
#include <kmimesourcefactory.h>
diff --git a/tdecore/kcrash.cpp b/tdecore/tdecrash.cpp
index 163b10d36..eceece166 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/tdecrash.cpp
@@ -1,5 +1,5 @@
/*
- * This file is part of the KDE Libraries
+ * This file is part of the TDE Libraries
* Copyright (C) 2000 Timo Hummel <[email protected]>
* Tom Braun <[email protected]>
*
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
-#include "kcrash.h"
+#include "tdecrash.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -148,10 +148,10 @@ TDECrash::defaultCrashHandler (int sig)
if (appName)
{
#ifndef NDEBUG
- fprintf(stderr, "[kcrash] TDECrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter);
- fprintf(stderr, "[kcrash] TDECrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid());
+ fprintf(stderr, "[tdecrash] TDECrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter);
+ fprintf(stderr, "[tdecrash] TDECrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid());
#else
- fprintf(stderr, "[kcrash] TDECrash: Application '%s' crashing...\n", appName ? appName : "<unknown>");
+ fprintf(stderr, "[tdecrash] TDECrash: Application '%s' crashing...\n", appName ? appName : "<unknown>");
#endif
const char * argv[24]; // don't forget to update this
@@ -231,13 +231,13 @@ TDECrash::defaultCrashHandler (int sig)
}
else {
- fprintf(stderr, "[kcrash] Unknown appname\n");
+ fprintf(stderr, "[tdecrash] Unknown appname\n");
}
}
if (crashRecursionCounter < 4)
{
- fprintf(stderr, "[kcrash] Unable to start Dr. Konqi\n");
+ fprintf(stderr, "[tdecrash] Unable to start Dr. Konqi\n");
}
#endif //Q_OS_UNIX
@@ -277,7 +277,7 @@ void TDECrash::startDrKonqi( const char* argv[], int argc )
int len = strlen( argv[ i ] ) + 1; // include terminating \0
if( pos + len > BUFSIZE )
{
- fprintf( stderr, "[kcrash] BUFSIZE in TDECrash not big enough!\n" );
+ fprintf( stderr, "[tdecrash] BUFSIZE in TDECrash not big enough!\n" );
startDirectly( argv, argc );
return;
}
@@ -317,7 +317,7 @@ void TDECrash::startDrKonqi( const char* argv[], int argc )
// If we can't reach tdeinit we can still at least try to fork()
void TDECrash::startDirectly( const char* argv[], int )
{
- fprintf( stderr, "[kcrash] TDECrash cannot reach tdeinit, launching directly.\n" );
+ fprintf( stderr, "[tdecrash] TDECrash cannot reach tdeinit, launching directly.\n" );
pid_t pid = fork();
if (pid <= 0)
{
@@ -448,12 +448,12 @@ static int openSocket()
{
if (!home_dir || !home_dir[0])
{
- fprintf(stderr, "[kcrash] Warning: $HOME not set!\n");
+ fprintf(stderr, "[tdecrash] Warning: $HOME not set!\n");
return -1;
}
if (strlen(home_dir) > (MAX_SOCK_FILE-100))
{
- fprintf(stderr, "[kcrash] Warning: Home directory path too long!\n");
+ fprintf(stderr, "[tdecrash] Warning: Home directory path too long!\n");
return -1;
}
kde_home++;
@@ -470,7 +470,7 @@ static int openSocket()
strncat(sock_file, getenv("XAUTHLOCALHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1);
else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
{
- perror("[kcrash] Warning: Could not determine hostname: ");
+ perror("[tdecrash] Warning: Could not determine hostname: ");
return -1;
}
sock_file[sizeof(sock_file)-1] = '\0';
@@ -479,13 +479,13 @@ static int openSocket()
display = getDisplay();
if (display == NULL)
{
- fprintf(stderr, "[kcrash] Error: Could not determine display.\n");
+ fprintf(stderr, "[tdecrash] Error: Could not determine display.\n");
return -1;
}
if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE)
{
- fprintf(stderr, "[kcrash] Warning: Socket name will be too long.\n");
+ fprintf(stderr, "[tdecrash] Warning: Socket name will be too long.\n");
free(display);
return -1;
}
@@ -495,7 +495,7 @@ static int openSocket()
if (strlen(sock_file) >= sizeof(server.sun_path))
{
- fprintf(stderr, "[kcrash] Warning: Path of socketfile exceeds UNIX_PATH_MAX.\n");
+ fprintf(stderr, "[tdecrash] Warning: Path of socketfile exceeds UNIX_PATH_MAX.\n");
return -1;
}
@@ -505,7 +505,7 @@ static int openSocket()
s = socket(PF_UNIX, SOCK_STREAM, 0);
if (s < 0)
{
- perror("[kcrash] Warning: socket creation failed: ");
+ perror("[tdecrash] Warning: socket creation failed: ");
return -1;
}
@@ -514,7 +514,7 @@ static int openSocket()
socklen = sizeof(server);
if(connect(s, (struct sockaddr *)&server, socklen) == -1)
{
- perror("[kcrash] Warning: socket connection failed: ");
+ perror("[tdecrash] Warning: socket connection failed: ");
close(s);
return -1;
}
diff --git a/tdecore/kcrash.h b/tdecore/tdecrash.h
index 0ea938bfe..68caf6dd8 100644
--- a/tdecore/kcrash.h
+++ b/tdecore/tdecrash.h
@@ -1,5 +1,5 @@
/*
- * This file is part of the KDE Libraries
+ * This file is part of the TDE Libraries
* Copyright (C) 2000 Timo Hummel <[email protected]>
* Tom Braun <[email protected]>
* This library is free software; you can redistribute it and/or
@@ -19,8 +19,8 @@
*
*/
-#ifndef __KCRASH_H
-#define __KCRASH_H
+#ifndef __TDECRASH_H
+#define __TDECRASH_H
#include <tqstring.h>
#include "tdelibs_export.h"
@@ -98,7 +98,7 @@ class TDECORE_EXPORT TDECrash
* @param path the application path.
*/
static void setApplicationPath (TQString path) { appPath = tqstrdup(path.local8Bit().data()); }
- /* KDE 4: Make it const TQString & */
+ /* Future: Make it const TQString & */
/**
* Sets the application name @p name which should be passed to
@@ -106,7 +106,7 @@ class TDECORE_EXPORT TDECrash
* @param name the name of the application, as shown in Dr. Konqi
*/
static void setApplicationName (TQString name) { appName = tqstrdup(name.local8Bit().data()); }
- /* KDE 4: Make it const TQString & */
+ /* Future: Make it const TQString & */
protected:
/**
diff --git a/tdecore/tdeprocess.cpp b/tdecore/tdeprocess.cpp
index d3add5843..e60f30118 100644
--- a/tdecore/tdeprocess.cpp
+++ b/tdecore/tdeprocess.cpp
@@ -32,11 +32,6 @@
#define __svr4__
#endif
-#ifdef __osf__
-#define _OSF_SOURCE
-#include <float.h>
-#endif
-
#ifdef _AIX
#define _ALL_SOURCE
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-16 07:18:17 +0000