Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mostly all-in-one build fixes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-08-25 21:33:15 +00:00
parent f1d4aa0092
commit 2c3aabd1a3
12 changed files with 184 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/KatieBuildMacros.cmake
View file

@ -172,7 +172,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
if(NOT KATIE_ALLINONE)
set(${FORTARGET}_SOURCES ${resourcesdep} ${ARGN} PARENT_SCOPE)
# blacklisted targets are failing and too important for other components
elseif("${FORTARGET}" MATCHES "(KtCore|KtGui)")
elseif("${FORTARGET}" MATCHES "(KtCore|KtGui|KtOpenGL|KtHelp|KtDeclarative|KtDesigner|lupdate|designer|qtgradienteditor|shareddeviceskin)")
katie_warning("All-in-one build not yet support for: ${FORTARGET}")
set(${FORTARGET}_SOURCES ${resourcesdep} ${ARGN} PARENT_SCOPE)
else()

72
src/plugins/bearer/connman/qconnmanservice_linux.cpp
View file

@ -76,7 +76,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMap &map)
return argument;
}
static QDBusConnection dbusConnection = QDBusConnection::systemBus();
static QDBusConnection connmanConnection = QDBusConnection::systemBus();
QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent)
@ -120,11 +120,11 @@ void QConnmanManagerInterface::connectNotify(const char *signal)
QConnmanDBusHelper *helper;
helper = new QConnmanDBusHelper(this);
dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
QLatin1String(CONNMAN_MANAGER_PATH),
QLatin1String(CONNMAN_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
QLatin1String(CONNMAN_MANAGER_PATH),
QLatin1String(CONNMAN_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -380,11 +380,11 @@ QConnmanProfileInterface::~QConnmanProfileInterface()
void QConnmanProfileInterface::connectNotify(const char *signal)
{
if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_PROFILE_INTERFACE),
QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_PROFILE_INTERFACE),
QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
}
}
@ -448,21 +448,21 @@ QConnmanServiceInterface::~QConnmanServiceInterface()
void QConnmanServiceInterface::connectNotify(const char *signal)
{
if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_SERVICE_INTERFACE),
QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_SERVICE_INTERFACE),
QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
}
if (signal == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
QConnmanDBusHelper *helper;
helper = new QConnmanDBusHelper(this);
dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_SERVICE_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_SERVICE_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
@ -775,21 +775,21 @@ QConnmanTechnologyInterface::~QConnmanTechnologyInterface()
void QConnmanTechnologyInterface::connectNotify(const char *signal)
{
if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_TECHNOLOGY_INTERFACE),
QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_TECHNOLOGY_INTERFACE),
QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
}
if (signal == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) {
QConnmanDBusHelper *helper;
helper = new QConnmanDBusHelper(this);
dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_TECHNOLOGY_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
this->path(),
QLatin1String(CONNMAN_TECHNOLOGY_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
@ -855,11 +855,11 @@ QConnmanAgentInterface::~QConnmanAgentInterface()
void QConnmanAgentInterface::connectNotify(const char *signal)
{
if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
// dbusConnection.connect(QLatin1String(CONNMAN_SERVICE),
// this->path(),
// QLatin1String(CONNMAN_NETWORK_INTERFACE),
// QLatin1String("PropertyChanged"),
// this,SIGNAL(propertyChanged(QString,QVariant&)));
// connmanConnection.connect(QLatin1String(CONNMAN_SERVICE),
// this->path(),
// QLatin1String(CONNMAN_NETWORK_INTERFACE),
// QLatin1String("PropertyChanged"),
// this,SIGNAL(propertyChanged(QString,QVariant&)));
}
}

82
src/plugins/bearer/connman/qofonoservice_linux.cpp
View file

@ -74,7 +74,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, ObjectPathPropert
}
QT_BEGIN_NAMESPACE
static QDBusConnection dbusConnection = QDBusConnection::systemBus();
static QDBusConnection ofonoConnection = QDBusConnection::systemBus();
QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent)
@ -133,11 +133,11 @@ void QOfonoManagerInterface::connectNotify(const char *signal)
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
QLatin1String(OFONO_MANAGER_PATH),
QLatin1String(OFONO_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
QLatin1String(OFONO_MANAGER_PATH),
QLatin1String(OFONO_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -283,11 +283,11 @@ void QOfonoModemInterface::connectNotify(const char *signal)
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_MODEM_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_MODEM_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -414,11 +414,11 @@ if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -512,11 +512,11 @@ if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -615,11 +615,11 @@ if (signal == SIGNAL(propertyChanged(QString,QDBusVariant))) {
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_SIM_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_SIM_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -712,11 +712,11 @@ void QOfonoDataConnectionManagerInterface::connectNotify(const char *signal)
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -831,11 +831,11 @@ void QOfonoPrimaryDataContextInterface::connectNotify(const char *signal)
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_DATA_CONTEXT_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_DATA_CONTEXT_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
@ -913,11 +913,11 @@ void QOfonoSmsInterface::connectNotify(const char *signal)
QOfonoDBusHelper *helper;
helper = new QOfonoDBusHelper(this);
dbusConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
ofonoConnection.connect(QLatin1String(OFONO_SERVICE),
this->path(),
QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
QLatin1String("PropertyChanged"),
helper,SLOT(propertyChanged(QString,QDBusVariant)));
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),

140
src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
View file

@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
static QDBusConnection dbusConnection = QDBusConnection::systemBus();
static QDBusConnection nmConnection = QDBusConnection::systemBus();
class QNetworkManagerInterfacePrivate
{
@ -74,7 +74,7 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
dbusConnection);
nmConnection);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -104,25 +104,25 @@ bool QNetworkManagerInterface::setConnections()
if(!isValid() )
return false;
bool allOk = false;
if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>)))) {
if (!nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>)))) {
allOk = true;
}
if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
QLatin1String("DeviceAdded"),
this,SIGNAL(deviceAdded(QDBusObjectPath)))) {
if (!nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
QLatin1String("DeviceAdded"),
this,SIGNAL(deviceAdded(QDBusObjectPath)))) {
allOk = true;
}
if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
QLatin1String("DeviceRemoved"),
this,SIGNAL(deviceRemoved(QDBusObjectPath)))) {
if (!nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
QLatin1String(NM_DBUS_PATH),
QLatin1String(NM_DBUS_INTERFACE),
QLatin1String("DeviceRemoved"),
this,SIGNAL(deviceRemoved(QDBusObjectPath)))) {
allOk = true;
}
@ -198,7 +198,7 @@ QNetworkManagerInterfaceAccessPoint::QNetworkManagerInterfaceAccessPoint(const Q
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT),
dbusConnection);
nmConnection);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -229,11 +229,11 @@ bool QNetworkManagerInterfaceAccessPoint::setConnections()
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
if(nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
allOk = true;
}
@ -306,7 +306,7 @@ QNetworkManagerInterfaceDevice::QNetworkManagerInterfaceDevice(const QString &de
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE),
dbusConnection);
nmConnection);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -335,11 +335,11 @@ bool QNetworkManagerInterfaceDevice::setConnections()
nmDBusHelper = new QNmDBusHelper(this);
connect(nmDBusHelper,SIGNAL(pathForStateChanged(QString,quint32)),
this, SIGNAL(stateChanged(QString,quint32)));
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE),
QLatin1String("StateChanged"),
nmDBusHelper,SLOT(deviceStateChanged(quint32)))) {
if(nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE),
QLatin1String("StateChanged"),
nmDBusHelper,SLOT(deviceStateChanged(quint32)))) {
allOk = true;
}
return allOk;
@ -397,7 +397,7 @@ QNetworkManagerInterfaceDeviceWired::QNetworkManagerInterfaceDeviceWired(const Q
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED),
dbusConnection, parent);
nmConnection, parent);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -428,11 +428,11 @@ bool QNetworkManagerInterfaceDeviceWired::setConnections()
nmDBusHelper = new QNmDBusHelper(this);
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
if(nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
allOk = true;
}
return allOk;
@ -474,7 +474,7 @@ QNetworkManagerInterfaceDeviceWireless::QNetworkManagerInterfaceDeviceWireless(c
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
dbusConnection, parent);
nmConnection, parent);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -510,29 +510,29 @@ bool QNetworkManagerInterfaceDeviceWireless::setConnections()
connect(nmDBusHelper, SIGNAL(pathForAccessPointRemoved(QString,QDBusObjectPath)),
this,SIGNAL(accessPointRemoved(QString,QDBusObjectPath)));
if(!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
QLatin1String("AccessPointAdded"),
nmDBusHelper, SLOT(slotAccessPointAdded(QDBusObjectPath)))) {
if(!nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
QLatin1String("AccessPointAdded"),
nmDBusHelper, SLOT(slotAccessPointAdded(QDBusObjectPath)))) {
allOk = true;
}
if(!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
QLatin1String("AccessPointRemoved"),
nmDBusHelper, SLOT(slotAccessPointRemoved(QDBusObjectPath)))) {
if(!nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
QLatin1String("AccessPointRemoved"),
nmDBusHelper, SLOT(slotAccessPointRemoved(QDBusObjectPath)))) {
allOk = true;
}
if(!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>)))) {
if(!nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>)))) {
allOk = true;
}
@ -591,7 +591,7 @@ QNetworkManagerSettings::QNetworkManagerSettings(const QString &settingsService,
d->connectionInterface = new QDBusInterface(settingsService,
QLatin1String(NM_DBUS_PATH_SETTINGS),
QLatin1String(NM_DBUS_IFACE_SETTINGS),
dbusConnection);
nmConnection);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -614,9 +614,9 @@ bool QNetworkManagerSettings::setConnections()
{
bool allOk = false;
if (!dbusConnection.connect(d->path, QLatin1String(NM_DBUS_PATH_SETTINGS),
QLatin1String(NM_DBUS_IFACE_SETTINGS), QLatin1String("NewConnection"),
this, SIGNAL(newConnection(QDBusObjectPath)))) {
if (!nmConnection.connect(d->path, QLatin1String(NM_DBUS_PATH_SETTINGS),
QLatin1String(NM_DBUS_IFACE_SETTINGS), QLatin1String("NewConnection"),
this, SIGNAL(newConnection(QDBusObjectPath)))) {
allOk = true;
}
@ -655,7 +655,7 @@ QNetworkManagerSettingsConnection::QNetworkManagerSettingsConnection(const QStri
d->connectionInterface = new QDBusInterface(settingsService,
d->path,
QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION),
dbusConnection, parent);
nmConnection, parent);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -682,12 +682,12 @@ bool QNetworkManagerSettingsConnection::setConnections()
return false;
bool allOk = false;
if(!dbusConnection.connect(d->service, d->path,
QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION), QLatin1String("Updated"),
this, SIGNAL(updated(QNmSettingsMap)))) {
if(!nmConnection.connect(d->service, d->path,
QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION), QLatin1String("Updated"),
this, SIGNAL(updated(QNmSettingsMap)))) {
allOk = true;
} else {
QDBusError error = dbusConnection.lastError();
QDBusError error = nmConnection.lastError();
}
delete nmDBusHelper;
@ -695,9 +695,9 @@ bool QNetworkManagerSettingsConnection::setConnections()
connect(nmDBusHelper, SIGNAL(pathForSettingsRemoved(QString)),
this,SIGNAL(removed(QString)));
if (!dbusConnection.connect(d->service, d->path,
QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION), QLatin1String("Removed"),
nmDBusHelper, SIGNAL(slotSettingsRemoved()))) {
if (!nmConnection.connect(d->service, d->path,
QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION), QLatin1String("Removed"),
nmDBusHelper, SIGNAL(slotSettingsRemoved()))) {
allOk = true;
}
@ -808,7 +808,7 @@ QNetworkManagerConnectionActive::QNetworkManagerConnectionActive( const QString
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION),
dbusConnection, parent);
nmConnection, parent);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;
@ -837,11 +837,11 @@ bool QNetworkManagerConnectionActive::setConnections()
nmDBusHelper = new QNmDBusHelper(this);
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
if(nmConnection.connect(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION),
QLatin1String("PropertiesChanged"),
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
allOk = true;
}
@ -902,7 +902,7 @@ QNetworkManagerIp4Config::QNetworkManagerIp4Config( const QString &deviceObjectP
d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
d->path,
QLatin1String(NM_DBUS_INTERFACE_IP4_CONFIG),
dbusConnection, parent);
nmConnection, parent);
if (!d->connectionInterface->isValid()) {
d->valid = false;
return;

8
src/shared/linguist/qph.cpp
View file

@ -127,7 +127,7 @@ static bool loadQPH(Translator &translator, QIODevice &dev, ConversionData &)
return reader.read(translator);
}
static QString protect(const QString &str)
static QString protectQph(const QString &str)
{
QString result;
result.reserve(str.length() * 12 / 10);
@ -173,14 +173,14 @@ static bool saveQPH(const Translator &translator, QIODevice &dev, ConversionData
t << ">\n";
foreach (const TranslatorMessage &msg, translator.messages()) {
t << "<phrase>\n";
t << " <source>" << protect(msg.sourceText()) << "</source>\n";
t << " <source>" << protectQph(msg.sourceText()) << "</source>\n";
QString str = msg.translations().join(QLatin1String("@"));
str.replace(QChar(Translator::BinaryVariantSeparator),
QChar(Translator::TextVariantSeparator));
t << " <target>" << protect(str)
t << " <target>" << protectQph(str)
<< "</target>\n";
if (!msg.comment().isEmpty())
t << " <definition>" << protect(msg.comment()) << "</definition>\n";
t << " <definition>" << protectQph(msg.comment()) << "</definition>\n";
t << "</phrase>\n";
}
t << "</QPH>\n";

26
src/shared/linguist/ts.cpp
View file

@ -443,7 +443,7 @@ static QString numericEntity(int ch)
: QLatin1String("&#x%1;")) .arg(ch, 0, 16);
}
static QString protect(const QString &str)
static QString protectTs(const QString &str)
{
QString result;
result.reserve(str.length() * 12 / 10);
@ -480,15 +480,15 @@ static QString evilBytes(const QString& str,
{
//qDebug() << "EVIL: " << str << isUtf8 << format << codecName;
if (isUtf8)
return protect(str);
return protectTs(str);
if (format == 20)
return protect(str);
return protectTs(str);
if (codecName == "UTF-8")
return protect(str);
return protectTs(str);
QTextCodec *codec = QTextCodec::codecForName(codecName);
if (!codec)
return protect(str);
QString t = QString::fromLatin1(codec->fromUnicode(protect(str)).data());
return protectTs(str);
QString t = QString::fromLatin1(codec->fromUnicode(protectTs(str)).data());
int len = (int) t.length();
QString result;
// FIXME: Factor is sensible only for latin scripts, probably.
@ -508,7 +508,7 @@ static void writeExtras(QTextStream &t, const char *indent,
for (Translator::ExtraData::ConstIterator it = extras.begin(); it != extras.end(); ++it) {
if (!drops.exactMatch(it.key())) {
t << indent << "<extra-" << it.key() << '>'
<< protect(it.value())
<< protectTs(it.value())
<< "</extra-" << it.key() << ">\n";
}
}
@ -522,7 +522,7 @@ static void writeVariants(QTextStream &t, const char *indent, const QString &inp
int start = 0;
forever {
t << "\n " << indent << "<lengthvariant>"
<< protect(input.mid(start, offset - start))
<< protectTs(input.mid(start, offset - start))
<< "</lengthvariant>";
if (offset == input.length())
break;
@ -533,7 +533,7 @@ static void writeVariants(QTextStream &t, const char *indent, const QString &inp
}
t << "\n" << indent;
} else {
t << ">" << protect(input);
t << ">" << protectTs(input);
}
}
@ -666,7 +666,7 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd, in
<< "</source>\n";
if (format != 11 && !msg.oldSourceText().isEmpty())
t << " <oldsource>" << protect(msg.oldSourceText()) << "</oldsource>\n";
t << " <oldsource>" << protectTs(msg.oldSourceText()) << "</oldsource>\n";
if (!msg.comment().isEmpty()) {
t << " <comment>"
@ -677,14 +677,14 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd, in
if (format != 11) {
if (!msg.oldComment().isEmpty())
t << " <oldcomment>" << protect(msg.oldComment()) << "</oldcomment>\n";
t << " <oldcomment>" << protectTs(msg.oldComment()) << "</oldcomment>\n";
if (!msg.extraComment().isEmpty())
t << " <extracomment>" << protect(msg.extraComment())
t << " <extracomment>" << protectTs(msg.extraComment())
<< "</extracomment>\n";
if (!msg.translatorComment().isEmpty())
t << " <translatorcomment>" << protect(msg.translatorComment())
t << " <translatorcomment>" << protectTs(msg.translatorComment())
<< "</translatorcomment>\n";
}

5
src/shared/qclass_lib_map.h
View file

@ -750,6 +750,9 @@ static const ClassInfoEntry qclass_lib_map[] = {
{ "QTcpServer", "QtNetwork/qtcpserver.h"},
{ "QTcpSocket", "QtNetwork/qtcpsocket.h"},
{ "QUdpSocket", "QtNetwork/qudpsocket.h"},
{ "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"},
{ "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"},
{ "QNetworkSession", "QtNetwork/qnetworksession.h"},
{ "QAuthenticator", "QtNetwork/qauthenticator.h"},
{ "QIPv6Address", "QtNetwork/qhostaddress.h"},
{ "QHostAddress", "QtNetwork/qhostaddress.h"},
@ -782,6 +785,6 @@ static const ClassInfoEntry qclass_lib_map[] = {
{ "QSslKey", "QtNetwork/qsslkey.h"},
{ "QSslSocket", "QtNetwork/qsslsocket.h"},
};
static const int qclass_lib_count = 776;
static const int qclass_lib_count = 779;
#endif

4
src/shared/qtgradienteditor/qtcolorbutton.cpp
View file

@ -40,10 +40,10 @@
****************************************************************************/
#include "qtcolorbutton.h"
#include <QtCore/QEvent>
#include <QtCore/QMimeData>
#include <QtGui/QColorDialog>
#include <QtGui/QPainter>
#include <QtCore/QMimeData>
#include <QtGui/qevent.h>
#include <QtGui/QApplication>
QT_BEGIN_NAMESPACE

12
src/shared/qtpropertybrowser/qteditorfactory.cpp
View file

@ -1977,7 +1977,7 @@ void QtEnumEditorFactory::disconnectPropertyManager(QtEnumPropertyManager *manag
// QtCursorEditorFactory
Q_GLOBAL_STATIC(QtCursorDatabase, cursorDatabase)
Q_GLOBAL_STATIC(QtCursorDatabase, editorCursorDatabase)
class QtCursorEditorFactoryPrivate
{
@ -2014,7 +2014,7 @@ void QtCursorEditorFactoryPrivate::slotPropertyChanged(QtProperty *property, con
return;
m_updatingEnum = true;
m_enumPropertyManager->setValue(enumProp, cursorDatabase()->cursorToValue(cursor));
m_enumPropertyManager->setValue(enumProp, editorCursorDatabase()->cursorToValue(cursor));
m_updatingEnum = false;
}
@ -2030,7 +2030,7 @@ void QtCursorEditorFactoryPrivate::slotEnumChanged(QtProperty *property, int val
if (!cursorManager)
return;
#ifndef QT_NO_CURSOR
cursorManager->setValue(prop, QCursor(cursorDatabase()->valueToCursor(value)));
cursorManager->setValue(prop, QCursor(editorCursorDatabase()->valueToCursor(value)));
#endif
}
@ -2115,10 +2115,10 @@ QWidget *QtCursorEditorFactory::createEditor(QtCursorPropertyManager *manager, Q
enumProp = d_ptr->m_propertyToEnum[property];
} else {
enumProp = d_ptr->m_enumPropertyManager->addProperty(property->propertyName());
d_ptr->m_enumPropertyManager->setEnumNames(enumProp, cursorDatabase()->cursorShapeNames());
d_ptr->m_enumPropertyManager->setEnumIcons(enumProp, cursorDatabase()->cursorShapeIcons());
d_ptr->m_enumPropertyManager->setEnumNames(enumProp, editorCursorDatabase()->cursorShapeNames());
d_ptr->m_enumPropertyManager->setEnumIcons(enumProp, editorCursorDatabase()->cursorShapeIcons());
#ifndef QT_NO_CURSOR
d_ptr->m_enumPropertyManager->setValue(enumProp, cursorDatabase()->cursorToValue(manager->value(property)));
d_ptr->m_enumPropertyManager->setValue(enumProp, editorCursorDatabase()->cursorToValue(manager->value(property)));
#endif
d_ptr->m_propertyToEnum[property] = enumProp;
d_ptr->m_enumToProperty[enumProp] = property;

8
src/shared/qtpropertybrowser/qtpropertymanager.cpp
View file

@ -6304,11 +6304,11 @@ void QtColorPropertyManager::uninitializeProperty(QtProperty *property)
// Make sure icons are removed as soon as QApplication is destroyed, otherwise,
// handles are leaked on X11.
static void clearCursorDatabase();
Q_GLOBAL_STATIC_WITH_INITIALIZER(QtCursorDatabase, cursorDatabase, qAddPostRoutine(clearCursorDatabase))
Q_GLOBAL_STATIC_WITH_INITIALIZER(QtCursorDatabase, propertyCursorDatabase, qAddPostRoutine(clearCursorDatabase))
static void clearCursorDatabase()
{
cursorDatabase()->clear();
propertyCursorDatabase()->clear();
}
class QtCursorPropertyManagerPrivate
@ -6388,7 +6388,7 @@ QString QtCursorPropertyManager::valueText(const QtProperty *property) const
if (it == d_ptr->m_values.constEnd())
return QString();
return cursorDatabase()->cursorToShapeName(it.value());
return propertyCursorDatabase()->cursorToShapeName(it.value());
}
/*!
@ -6400,7 +6400,7 @@ QIcon QtCursorPropertyManager::valueIcon(const QtProperty *property) const
if (it == d_ptr->m_values.constEnd())
return QIcon();
return cursorDatabase()->cursorToShapeIcon(it.value());
return propertyCursorDatabase()->cursorToShapeIcon(it.value());
}
/*!

2
src/tools/qscript/bytearrayprototype.cpp
View file

@ -41,7 +41,9 @@
#include "bytearrayprototype.h"
#include <QtScript/QScriptEngine>
#ifndef QT_ALLINONE
Q_DECLARE_METATYPE(QByteArray*)
#endif
ByteArrayPrototype::ByteArrayPrototype(QObject *parent)
: QObject(parent)

2
src/tools/qtconfig/mainwindow.cpp
View file

@ -218,7 +218,7 @@ MainWindow::MainWindow()
modified = true;
desktopThemeName = tr("Desktop Settings (Default)");
setWindowIcon(QPixmap(":/trolltech/qtconfig/images/qtconfig.png"));
setWindowIcon(QPixmap(QLatin1String(":/trolltech/qtconfig/images/qtconfig.png")));
QStringList gstyles = QStyleFactory::keys();
gstyles.sort();
ui->guiStyleCombo->addItem(desktopThemeName);