summaryrefslogtreecommitdiffstats
path: root/src/tools/qsettings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/qsettings.cpp')
-rw-r--r--src/tools/qsettings.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index ebec81889..250e5623d 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -462,7 +462,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
: groupDirty( TRUE ), modified(FALSE), globalScope(TRUE)
{
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( format != TQSettings::Ini )
return;
#else
@@ -809,7 +809,7 @@ static TQString groupKey( const TQString &group, const TQString &key )
*/
void TQSettings::insertSearchPath( System s, const TQString &path)
{
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd ) {
d->sysInsertSearchPath( s, path );
return;
@@ -832,12 +832,12 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
return;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd && s != Unix ) {
#else
if ( s != Unix ) {
#endif
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
if(s != Mac) //mac is respected on the mac as well
#endif
return;
@@ -878,12 +878,12 @@ void TQSettings::removeSearchPath( System s, const TQString &path)
return;
}
#endif
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd && s != Unix ) {
#else
if ( s != Unix ) {
#endif
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
if(s != Mac) //mac is respected on the mac as well
#endif
return;
@@ -907,7 +907,7 @@ TQSettings::TQSettings()
d = new TQSettingsPrivate( Native );
TQ_CHECK_PTR(d);
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
d->sysd = 0;
d->sysInit();
#endif
@@ -927,7 +927,7 @@ TQSettings::TQSettings( Format format )
d = new TQSettingsPrivate( format );
TQ_CHECK_PTR(d);
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
d->sysd = 0;
if ( format == Native )
d->sysInit();
@@ -945,7 +945,7 @@ TQSettings::~TQSettings()
{
sync();
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
d->sysClear();
#endif
@@ -960,7 +960,7 @@ TQSettings::~TQSettings()
*/
bool TQSettings::sync()
{
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysSync();
#endif
@@ -1127,7 +1127,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysReadBoolEntry( grp_key, def, ok );
#endif
@@ -1179,7 +1179,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysReadDoubleEntry( grp_key, def, ok );
#endif
@@ -1224,7 +1224,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysReadNumEntry( grp_key, def, ok );
#endif
@@ -1270,7 +1270,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o
return def;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysReadEntry( grp_key, def, ok );
#endif
@@ -1349,7 +1349,7 @@ bool TQSettings::writeEntry(const TQString &key, bool value)
return FALSE;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1380,7 +1380,7 @@ bool TQSettings::writeEntry(const TQString &key, double value)
return FALSE;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1410,7 +1410,7 @@ bool TQSettings::writeEntry(const TQString &key, int value)
return FALSE;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1463,7 +1463,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value)
return FALSE;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1526,7 +1526,7 @@ bool TQSettings::removeEntry(const TQString &key)
return FALSE;
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysRemoveEntry( grp_key );
#endif
@@ -1606,7 +1606,7 @@ TQStringList TQSettings::entryList(const TQString &key) const
return TQStringList();
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysEntryList( grp_key );
#endif
@@ -1714,7 +1714,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const
return TQStringList();
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return d->sysSubkeyList( grp_key );
#endif
@@ -1809,7 +1809,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key )
return TQDateTime();
}
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
if ( d->sysd )
return TQDateTime();
#endif
@@ -2041,7 +2041,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope
#if defined(TQ_WS_WIN)
actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
insertSearchPath( Windows, actualSearchPath );
-#elif !defined(TQWS) && defined(Q_OS_MAC)
+#elif defined(Q_OS_MAC)
if(lastDot != -1) {
TQString topLevelDomain = domain.right( domain.length() - lastDot - 1 ) + ".";
if ( !topLevelDomain.isEmpty() )
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 08:43:42 +0000