Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mac cruft remove

Browse source
This commit is contained in:
Ivailo Monev 2014-11-19 22:55:36 +00:00
parent 6aaebc720d
commit 4f94d74af8
6 changed files with 0 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kdecore/kernel/kstandarddirs.cpp
View file

@ -1104,23 +1104,6 @@ static QString checkExecutable( const QString& path, bool ignoreExecBit )
{
QFileInfo info( path );
QFileInfo orig = info;
#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
FILE *file;
if (file = fopen(orig.absoluteFilePath().toUtf8().constData(), "r")) {
fclose(file);
struct stat _stat;
if ((stat(orig.absoluteFilePath().toUtf8().constData(), &_stat)) < 0) {
return QString();
}
if ( ignoreExecBit || (_stat.st_mode & S_IXUSR) ) {
if ( ((_stat.st_mode & S_IFMT) == S_IFREG) || ((_stat.st_mode & S_IFMT) == S_IFLNK) ) {
orig.makeAbsolute();
return orig.filePath();
}
}
}
return QString();
#else
if( info.exists() && info.isSymLink() )
info = QFileInfo( info.canonicalFilePath() );
if( info.exists() && ( ignoreExecBit || info.isExecutable() ) && info.isFile() ) {
@ -1132,7 +1115,6 @@ static QString checkExecutable( const QString& path, bool ignoreExecBit )
}
//kDebug(180) << "checkExecutable(): failed, returning empty string";
return QString();
#endif
}
QString KStandardDirs::findExe( const QString& appname,

60
kdecore/localization/klocale_mac_p.h
View file

@ -1,60 +0,0 @@
/* This file is part of the KDE libraries
* Copyright 2010 John Layt <john@layt.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef KLOCALE_MAC_P_H
#define KLOCALE_MAC_P_H
#include "klocale_p.h"
#include <CoreFoundation/CoreFoundation.h>
class KLocaleMacPrivate : public KLocalePrivate
{
public:
KLocaleMacPrivate(KLocale *q_ptr, const QString &catalog, KSharedConfig::Ptr config);
KLocaleMacPrivate(KLocale *q_ptr, const QString& catalog,
const QString &language, const QString &country, KConfig *config);
KLocaleMacPrivate( const KLocaleMacPrivate &rhs );
KLocaleMacPrivate &operator=( const KLocaleMacPrivate &rhs );
virtual ~KLocaleMacPrivate();
protected:
/**************************
** Country settings **
**************************/
virtual QString systemCountry() const;
/***************************
** Encoding settings **
***************************/
virtual QByteArray systemCodeset() const;
private:
QString macLocaleValue( CFStringRef key ) const;
CFLocaleRef m_macLocale;
};
#endif // KLOCALE_MAC_P_H

10
kdeui/kernel/kuniqueapplication.cpp
View file

@ -66,9 +66,6 @@
# endif
#endif
#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
#include <kkernel_mac.h>
#endif
bool KUniqueApplication::Private::s_nofork = false;
bool KUniqueApplication::Private::s_multipleInstances = false;
@ -135,9 +132,6 @@ KUniqueApplication::start(StartFlags flags)
if (Private::s_nofork)
{
#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
mac_initialize_dbus();
#endif
QDBusConnectionInterface* dbusService = tryToInitDBusConnection();
@ -158,10 +152,6 @@ KUniqueApplication::start(StartFlags flags)
// We'll call newInstance in the constructor. Do nothing here.
return true;
#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
} else {
mac_fork_and_reexec_self();
#endif
}

64
kdeui/windowmanagement/kwindowinfo_mac_p.h
View file

@ -1,64 +0,0 @@
/*
This file is part of the KDE libraries
Copyright (C) 2008 Marijn Kruisselbrink (m.kruisselbrink@student.tue.nl)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef KWINDOWINFO_MAC_P_H
#define KWINDOWINFO_MAC_P_H
#include "kwindowinfo.h"
#include <Carbon/Carbon.h>
#include <QtCore/QString>
#include <QtCore/QList>
// bah, why do header files invade my namespace and define such normal words as check...
#ifdef check
#undef check
#endif
struct KWindowInfo::Private
{
Private();
~Private();
int ref;
WId win;
bool isLocal;
AXUIElementRef axElement() const { return m_axWin; }
void setAxElement(const AXUIElementRef& axWin);
ProcessSerialNumber psn() const { return m_psn; }
pid_t pid() const { return m_pid; }
void setProcessSerialNumber(const ProcessSerialNumber& psn);
QString name;
#ifdef Q_OS_MAC32
FSSpec iconSpec;
#else
FSRef iconSpec;
#endif
bool loadedData;
void updateData();
AXUIElementRef m_axWin;
QList<KWindowInfo::Private*> children;
KWindowInfo::Private* parent;
private:
Private( const Private& );
void operator=( const Private& );
ProcessSerialNumber m_psn;
pid_t m_pid;
};
#endif

4
kinit/kinit.cpp
View file

@ -1414,11 +1414,7 @@ static void kdeinit_library_path()
{
const QStringList ltdl_library_path =
QFile::decodeName(qgetenv("LTDL_LIBRARY_PATH")).split(QLatin1Char(':'),QString::SkipEmptyParts);
#ifdef Q_OS_DARWIN
const QByteArray ldlibpath = qgetenv("DYLD_LIBRARY_PATH");
#else
const QByteArray ldlibpath = qgetenv("LD_LIBRARY_PATH");
#endif
const QStringList ld_library_path =
QFile::decodeName(ldlibpath).split(QLatin1Char(':'),QString::SkipEmptyParts);

6
kinit/klauncher_main.cpp
View file

@ -48,9 +48,6 @@ static void sig_handler(int sig_num)
}
#endif
#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
#include <kkernel_mac.h>
#endif
extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
{
@ -63,9 +60,6 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
return 1;
}
#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
mac_initialize_dbus();
#endif
KComponentData componentData("klauncher", "kdelibs4");
KGlobal::locale();