diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2016-03-26 17:46:47 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2016-03-26 17:54:28 +0100 |
commit | 77a8a8f9dfc9a5cbbb8113c4e9cff6cc99e17d9f (patch) | |
tree | 14435c2fcf5d00244011e39a587dcbd81bc6d4d6 /kplayer/kplayerproperties.cpp | |
parent | 172761c982ab8ecb67dce7840564af5e89486d68 (diff) | |
download | kplayer-77a8a8f9dfc9a5cbbb8113c4e9cff6cc99e17d9f.tar.gz kplayer-77a8a8f9dfc9a5cbbb8113c4e9cff6cc99e17d9f.zip |
Initial TQt conversion
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kplayer/kplayerproperties.cpp')
-rw-r--r-- | kplayer/kplayerproperties.cpp | 750 |
1 files changed, 375 insertions, 375 deletions
diff --git a/kplayer/kplayerproperties.cpp b/kplayer/kplayerproperties.cpp index 97b10fb..3d7d2ab 100644 --- a/kplayer/kplayerproperties.cpp +++ b/kplayer/kplayerproperties.cpp @@ -16,8 +16,8 @@ #include <fcntl.h> #include <kconfig.h> #include <klocale.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqfileinfo.h> +#include <tqregexp.h> #define KPLAYER_PROCESS_SIZE_IDS #ifdef DEBUG @@ -34,33 +34,33 @@ #endif const KURL KPlayerProperties::nullUrl; -const QSize KPlayerProperties::nullSize; -const QStringList KPlayerProperties::nullStringList; -const QMap<int, QString> KPlayerProperties::nullIntegerStringMap; +const TQSize KPlayerProperties::nullSize; +const TQStringList KPlayerProperties::nullStringList; +const TQMap<int, TQString> KPlayerProperties::nullIntegerStringMap; KPlayerPropertyInfoMap KPlayerProperties::m_info; KPlayerStringPropertyInfo KPlayerProperties::m_meta_info; -QStringList KPlayerProperties::m_meta_attributes; +TQStringList KPlayerProperties::m_meta_attributes; KPlayerMediaMap KPlayerMedia::m_media_map; int KPlayerItemProperties::m_meta_info_timer = 0; #ifdef DEBUG kdbgstream kdDebugTime (void) { - return kdbgstream (0, 0) << QTime::currentTime().toString ("hh:mm:ss:zzz "); + return kdbgstream (0, 0) << TQTime::currentTime().toString ("hh:mm:ss:zzz "); } #endif -int compareStrings (const QString& s1, const QString& s2) +int compareStrings (const TQString& s1, const TQString& s2) { int r = s1.lower().localeAwareCompare (s2.lower()); return r ? r : s1.localeAwareCompare (s2); } -QString timeString (float l, bool zero_ok) +TQString timeString (float l, bool zero_ok) { l += 0.02; if ( ! zero_ok && l < 0.05 ) - return QString (""); + return TQString (""); int lHour = int (l) / 3600; if ( lHour > 0 ) l -= lHour * 3600; @@ -77,7 +77,7 @@ QString timeString (float l, bool zero_ok) lMinute ++; l -= 60; } - QString s; + TQString s; if ( lHour > 0 ) s.sprintf ("%u:%02u:%04.1f", lHour, lMinute, l); else if ( lMinute > 0 ) @@ -87,12 +87,12 @@ QString timeString (float l, bool zero_ok) return s; } -float stringToFloat (const QString& stime) +float stringToFloat (const TQString& stime) { int comma = stime.find (','); if ( comma >= 0 ) stime [comma] = '.'; - QStringList sl = QStringList::split (':', stime); + TQStringList sl = TQStringList::split (':', stime); int i = 0, n = 0; if ( sl.count() > 4 || sl.count() < 1 ) return 0; @@ -105,7 +105,7 @@ float stringToFloat (const QString& stime) return sl[i].toFloat() + n; } -static void capitalize (QString& key) +static void capitalize (TQString& key) { for ( uint n = 0; n < key.length(); n ++ ) if ( key[n].isLetter() ) @@ -115,7 +115,7 @@ static void capitalize (QString& key) } } -static void capitalizeWords (QString& key) +static void capitalizeWords (TQString& key) { bool inword = false; for ( uint n = 0; n < key.length(); n ++ ) @@ -141,7 +141,7 @@ KPlayerPropertyInfo::~KPlayerPropertyInfo() { } -bool KPlayerPropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerPropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return properties -> config() -> hasKey (name); } @@ -226,7 +226,7 @@ KPlayerProperty* KPlayerFrequencyPropertyInfo::copy (const KPlayerProperty* prop return new KPlayerFrequencyProperty (* (KPlayerFrequencyProperty*) property); } -bool KPlayerFrequencyPropertyInfo::exists (KPlayerProperties* properties, const QString&) const +bool KPlayerFrequencyPropertyInfo::exists (KPlayerProperties* properties, const TQString&) const { return properties -> needsFrequency(); } @@ -320,7 +320,7 @@ KPlayerProperty* KPlayerComboStringPropertyInfo::copy (const KPlayerProperty* pr return new KPlayerComboStringProperty (* (KPlayerComboStringProperty*) property); } -bool KPlayerComboStringPropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerComboStringPropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return KPlayerStringPropertyInfo::exists (properties, name) || KPlayerStringPropertyInfo::exists (properties, name + " Option"); @@ -355,7 +355,7 @@ KPlayerProperty* KPlayerStringHistoryPropertyInfo::copy (const KPlayerProperty* return new KPlayerStringHistoryProperty (* (KPlayerStringHistoryProperty*) property); } -bool KPlayerStringHistoryPropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerStringHistoryPropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return KPlayerStringPropertyInfo::exists (properties, name) || KPlayerStringPropertyInfo::exists (properties, name + " 0"); @@ -376,7 +376,7 @@ KPlayerProperty* KPlayerNamePropertyInfo::copy (const KPlayerProperty* property) return new KPlayerNameProperty (* (KPlayerNameProperty*) property); } -bool KPlayerNamePropertyInfo::exists (KPlayerProperties* properties, const QString&) const +bool KPlayerNamePropertyInfo::exists (KPlayerProperties* properties, const TQString&) const { return properties != properties -> configuration(); } @@ -395,7 +395,7 @@ KPlayerProperty* KPlayerAppendablePropertyInfo::copy (const KPlayerProperty* pro return new KPlayerAppendableProperty (* (KPlayerAppendableProperty*) property); } -bool KPlayerAppendablePropertyInfo::exists (KPlayerProperties* properties, const QString& name) const +bool KPlayerAppendablePropertyInfo::exists (KPlayerProperties* properties, const TQString& name) const { return KPlayerStringPropertyInfo::exists (properties, name) || KPlayerStringPropertyInfo::exists (properties, name + " Option"); @@ -461,12 +461,12 @@ KPlayerProperty::~KPlayerProperty() { } -QString KPlayerProperty::asString (void) const +TQString KPlayerProperty::asString (void) const { - return QString::null; + return TQString::null; } -void KPlayerProperty::fromString (const QString&) +void KPlayerProperty::fromString (const TQString&) { } @@ -475,11 +475,11 @@ int KPlayerProperty::compare (KPlayerProperty*) const return 0; } -void KPlayerProperty::read (KConfig*, const QString&) +void KPlayerProperty::read (KConfig*, const TQString&) { } -void KPlayerProperty::save (KConfig*, const QString&) const +void KPlayerProperty::save (KConfig*, const TQString&) const { } @@ -492,7 +492,7 @@ KPlayerBooleanProperty::~KPlayerBooleanProperty() { } -QString KPlayerBooleanProperty::asString (void) const +TQString KPlayerBooleanProperty::asString (void) const { return value() ? i18n("yes") : i18n("no"); } @@ -502,12 +502,12 @@ int KPlayerBooleanProperty::compare (KPlayerProperty* property) const return value() == ((KPlayerBooleanProperty*) property) -> value() ? 0 : value() ? 1 : -1; } -void KPlayerBooleanProperty::read (KConfig* config, const QString& name) +void KPlayerBooleanProperty::read (KConfig* config, const TQString& name) { setValue (config -> readBoolEntry (name, value())); } -void KPlayerBooleanProperty::save (KConfig* config, const QString& name) const +void KPlayerBooleanProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -516,12 +516,12 @@ KPlayerIntegerProperty::~KPlayerIntegerProperty() { } -QString KPlayerIntegerProperty::asString (void) const +TQString KPlayerIntegerProperty::asString (void) const { - return QString::number (value()); + return TQString::number (value()); } -void KPlayerIntegerProperty::fromString (const QString& value) +void KPlayerIntegerProperty::fromString (const TQString& value) { setValue (value.toInt()); } @@ -532,12 +532,12 @@ int KPlayerIntegerProperty::compare (KPlayerProperty* property) const return value() == property_value ? 0 : value() > property_value ? 1 : -1; } -void KPlayerIntegerProperty::read (KConfig* config, const QString& name) +void KPlayerIntegerProperty::read (KConfig* config, const TQString& name) { setValue (config -> readNumEntry (name, value())); } -void KPlayerIntegerProperty::save (KConfig* config, const QString& name) const +void KPlayerIntegerProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -565,7 +565,7 @@ void KPlayerRelativeProperty::setValue (int value, int current) } } -QString KPlayerRelativeProperty::asString (void) const +TQString KPlayerRelativeProperty::asString (void) const { return (option() == 0 ? '=' : option() > 0 ? '+' : '-') + KPlayerIntegerProperty::asString(); } @@ -584,13 +584,13 @@ int KPlayerRelativeProperty::compare (KPlayerProperty* property) const return result; } -void KPlayerRelativeProperty::read (KConfig* config, const QString& name) +void KPlayerRelativeProperty::read (KConfig* config, const TQString& name) { KPlayerIntegerProperty::read (config, name); setOption (config -> readNumEntry (name + " Option")); } -void KPlayerRelativeProperty::save (KConfig* config, const QString& name) const +void KPlayerRelativeProperty::save (KConfig* config, const TQString& name) const { if ( option() ) { @@ -603,9 +603,9 @@ KPlayerCacheProperty::~KPlayerCacheProperty() { } -QString KPlayerCacheProperty::asString (void) const +TQString KPlayerCacheProperty::asString (void) const { - return value() > 3 ? KPlayerIntegerProperty::asString() : QString::null; + return value() > 3 ? KPlayerIntegerProperty::asString() : TQString::null; } int KPlayerCacheProperty::compare (KPlayerProperty* property) const @@ -614,7 +614,7 @@ int KPlayerCacheProperty::compare (KPlayerProperty* property) const return value() == property_value || value() < 4 && property_value < 4 ? 0 : value() > property_value ? 1 : -1; } -void KPlayerCacheProperty::read (KConfig* config, const QString& name) +void KPlayerCacheProperty::read (KConfig* config, const TQString& name) { KPlayerIntegerProperty::read (config, name); if ( value() == 2 ) @@ -625,9 +625,9 @@ KPlayerFrequencyProperty::~KPlayerFrequencyProperty() { } -QString KPlayerFrequencyProperty::asString (void) const +TQString KPlayerFrequencyProperty::asString (void) const { - return QString::number ((float) value() / 1000); + return TQString::number ((float) value() / 1000); } int KPlayerFrequencyProperty::compare (KPlayerProperty* property) const @@ -637,7 +637,7 @@ int KPlayerFrequencyProperty::compare (KPlayerProperty* property) const return my_value == property_value ? 0 : my_value > property_value ? 1 : -1; } -void KPlayerFrequencyProperty::save (KConfig* config, const QString& name) const +void KPlayerFrequencyProperty::save (KConfig* config, const TQString& name) const { if ( m_value ) KPlayerIntegerProperty::save (config, name); @@ -653,9 +653,9 @@ KPlayerFloatProperty::~KPlayerFloatProperty() { } -QString KPlayerFloatProperty::asString (void) const +TQString KPlayerFloatProperty::asString (void) const { - return QString::number (value()); + return TQString::number (value()); } int KPlayerFloatProperty::compare (KPlayerProperty* property) const @@ -664,12 +664,12 @@ int KPlayerFloatProperty::compare (KPlayerProperty* property) const return value() == property_value ? 0 : value() > property_value ? 1 : -1; } -void KPlayerFloatProperty::read (KConfig* config, const QString& name) +void KPlayerFloatProperty::read (KConfig* config, const TQString& name) { setValue (config -> readDoubleNumEntry (name, value())); } -void KPlayerFloatProperty::save (KConfig* config, const QString& name) const +void KPlayerFloatProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -678,7 +678,7 @@ KPlayerLengthProperty::~KPlayerLengthProperty() { } -QString KPlayerLengthProperty::asString (void) const +TQString KPlayerLengthProperty::asString (void) const { return timeString (value()); } @@ -687,25 +687,25 @@ KPlayerSizeProperty::~KPlayerSizeProperty() { } -QString KPlayerSizeProperty::asString (void) const +TQString KPlayerSizeProperty::asString (void) const { - return QString::number (value().width()) + "x" + QString::number (value().height()); + return TQString::number (value().width()) + "x" + TQString::number (value().height()); } int KPlayerSizeProperty::compare (KPlayerProperty* property) const { - const QSize& property_value = ((KPlayerSizeProperty*) property) -> value(); + const TQSize& property_value = ((KPlayerSizeProperty*) property) -> value(); int area = value().width() * value().height(); int property_area = property_value.width() * property_value.height(); return area == property_area ? 0 : area > property_area ? 1 : -1; } -void KPlayerSizeProperty::read (KConfig* config, const QString& name) +void KPlayerSizeProperty::read (KConfig* config, const TQString& name) { setValue (config -> readSizeEntry (name, &m_value)); } -void KPlayerSizeProperty::save (KConfig* config, const QString& name) const +void KPlayerSizeProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value()); } @@ -714,22 +714,22 @@ KPlayerDisplaySizeProperty::~KPlayerDisplaySizeProperty() { } -QSize KPlayerDisplaySizeProperty::value (const QSize& current) const +TQSize KPlayerDisplaySizeProperty::value (const TQSize& current) const { if ( option() == 1 ) return value(); - return QSize (current.width(), value().height() * current.width() / value().width()); + return TQSize (current.width(), value().height() * current.width() / value().width()); } -void KPlayerDisplaySizeProperty::setValue (const QSize& value, int option) +void KPlayerDisplaySizeProperty::setValue (const TQSize& value, int option) { setOption (option); setValue (value); } -QString KPlayerDisplaySizeProperty::asString (void) const +TQString KPlayerDisplaySizeProperty::asString (void) const { - return QString (option() == 1 ? i18n("size %1") : i18n("aspect %1")).arg (KPlayerSizeProperty::asString()); + return TQString (option() == 1 ? i18n("size %1") : i18n("aspect %1")).arg (KPlayerSizeProperty::asString()); } int KPlayerDisplaySizeProperty::compare (KPlayerProperty* property) const @@ -738,13 +738,13 @@ int KPlayerDisplaySizeProperty::compare (KPlayerProperty* property) const return option() == property_option ? KPlayerSizeProperty::compare (property) : option() > property_option ? 1 : -1; } -void KPlayerDisplaySizeProperty::read (KConfig* config, const QString& name) +void KPlayerDisplaySizeProperty::read (KConfig* config, const TQString& name) { KPlayerSizeProperty::read (config, name); setOption (config -> readNumEntry (name + " Option", 1)); } -void KPlayerDisplaySizeProperty::save (KConfig* config, const QString& name) const +void KPlayerDisplaySizeProperty::save (KConfig* config, const TQString& name) const { KPlayerSizeProperty::save (config, name); if ( option() != 1 ) @@ -755,12 +755,12 @@ KPlayerStringProperty::~KPlayerStringProperty() { } -QString KPlayerStringProperty::asString (void) const +TQString KPlayerStringProperty::asString (void) const { return value(); } -void KPlayerStringProperty::fromString (const QString& value) +void KPlayerStringProperty::fromString (const TQString& value) { setValue (value); } @@ -770,12 +770,12 @@ int KPlayerStringProperty::compare (KPlayerProperty* property) const return compareStrings (asString(), property -> asString()); } -void KPlayerStringProperty::read (KConfig* config, const QString& name) +void KPlayerStringProperty::read (KConfig* config, const TQString& name) { m_value = config -> readEntry (name, value()); } -void KPlayerStringProperty::save (KConfig* config, const QString& name) const +void KPlayerStringProperty::save (KConfig* config, const TQString& name) const { if ( ! value().isEmpty() ) config -> writeEntry (name, value()); @@ -785,18 +785,18 @@ KPlayerComboStringProperty::~KPlayerComboStringProperty() { } -QString KPlayerComboStringProperty::asString (void) const +TQString KPlayerComboStringProperty::asString (void) const { return option().isNull() ? value() : option(); } -void KPlayerComboStringProperty::read (KConfig* config, const QString& name) +void KPlayerComboStringProperty::read (KConfig* config, const TQString& name) { KPlayerStringProperty::read (config, name); setOption (config -> readEntry (name + " Option", option())); } -void KPlayerComboStringProperty::save (KConfig* config, const QString& name) const +void KPlayerComboStringProperty::save (KConfig* config, const TQString& name) const { KPlayerStringProperty::save (config, name); if ( ! option().isNull() ) @@ -805,7 +805,7 @@ void KPlayerComboStringProperty::save (KConfig* config, const QString& name) con bool KPlayerComboStringProperty::defaults (bool) { - setOption (QString::null); + setOption (TQString::null); return value().isEmpty(); } @@ -813,7 +813,7 @@ KPlayerTranslatedStringProperty::~KPlayerTranslatedStringProperty() { } -QString KPlayerTranslatedStringProperty::asString (void) const +TQString KPlayerTranslatedStringProperty::asString (void) const { if ( value().find ('/') < 0 ) return i18n(value().utf8()); @@ -830,7 +830,7 @@ KPlayerStringHistoryProperty::~KPlayerStringHistoryProperty() { } -void KPlayerStringHistoryProperty::setValue (const QString& value) +void KPlayerStringHistoryProperty::setValue (const TQString& value) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerStringHistoryProperty::setValue\n"; @@ -846,7 +846,7 @@ void KPlayerStringHistoryProperty::setValue (const QString& value) } } -void KPlayerStringHistoryProperty::read (KConfig* config, const QString& name) +void KPlayerStringHistoryProperty::read (KConfig* config, const TQString& name) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerStringHistoryProperty::read\n"; @@ -859,8 +859,8 @@ void KPlayerStringHistoryProperty::read (KConfig* config, const QString& name) kdDebugTime() << " History " << value() << "\n"; #endif } - QString history; - for ( int i = 0; i < 10 && config -> hasKey (history = name + " " + QString::number (i)); i ++ ) + TQString history; + for ( int i = 0; i < 10 && config -> hasKey (history = name + " " + TQString::number (i)); i ++ ) { m_history << config -> readEntry (history); #ifdef DEBUG_KPLAYER_PROPERTIES @@ -869,13 +869,13 @@ void KPlayerStringHistoryProperty::read (KConfig* config, const QString& name) } } -void KPlayerStringHistoryProperty::save (KConfig* config, const QString& name) const +void KPlayerStringHistoryProperty::save (KConfig* config, const TQString& name) const { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerStringHistoryProperty::save\n"; #endif KPlayerStringProperty::save (config, name); - QStringList::ConstIterator it (history().begin()); + TQStringList::ConstIterator it (history().begin()); if ( it != history().end() && *it == value() ) ++ it; for ( int i = 0; i < 10 && it != history().end(); i ++ ) @@ -883,7 +883,7 @@ void KPlayerStringHistoryProperty::save (KConfig* config, const QString& name) c #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " History " << *it << "\n"; #endif - config -> writeEntry (name + " " + QString::number (i), * it ++); + config -> writeEntry (name + " " + TQString::number (i), * it ++); } } */ @@ -892,12 +892,12 @@ KPlayerNameProperty::~KPlayerNameProperty() { } -QString KPlayerNameProperty::asString (void) const +TQString KPlayerNameProperty::asString (void) const { return value().isEmpty() ? m_properties -> defaultName() : value(); } -void KPlayerNameProperty::save (KConfig* config, const QString& name) const +void KPlayerNameProperty::save (KConfig* config, const TQString& name) const { if ( ! value().isEmpty() && value() != m_properties -> defaultName() ) KPlayerStringProperty::save (config, name); @@ -905,7 +905,7 @@ void KPlayerNameProperty::save (KConfig* config, const QString& name) const bool KPlayerNameProperty::defaults (bool) { - setValue (QString::null); + setValue (TQString::null); return false; } @@ -913,26 +913,26 @@ KPlayerAppendableProperty::~KPlayerAppendableProperty() { } -QString KPlayerAppendableProperty::appendableValue (const QString& current) const +TQString KPlayerAppendableProperty::appendableValue (const TQString& current) const { if ( option() == 0 ) return value(); return value().isEmpty() ? current : current.isEmpty() ? value() : current + " " + value(); } -void KPlayerAppendableProperty::setAppendableValue (const QString& value, bool append) +void KPlayerAppendableProperty::setAppendableValue (const TQString& value, bool append) { setOption (append); setValue (value); } -void KPlayerAppendableProperty::read (KConfig* config, const QString& name) +void KPlayerAppendableProperty::read (KConfig* config, const TQString& name) { KPlayerStringProperty::read (config, name); setOption (config -> readBoolEntry (name + " Option", false)); } -void KPlayerAppendableProperty::save (KConfig* config, const QString& name) const +void KPlayerAppendableProperty::save (KConfig* config, const TQString& name) const { KPlayerStringProperty::save (config, name); if ( option() ) @@ -948,19 +948,19 @@ bool KPlayerStringListProperty::defaults (bool) return false; } -void KPlayerStringListProperty::read (KConfig* config, const QString& name) +void KPlayerStringListProperty::read (KConfig* config, const TQString& name) { for ( int i = 0; i < config -> readNumEntry (name); i ++ ) - m_value.append (config -> readEntry ("Child" + QString::number (i))); + m_value.append (config -> readEntry ("Child" + TQString::number (i))); } -void KPlayerStringListProperty::save (KConfig* config, const QString& name) const +void KPlayerStringListProperty::save (KConfig* config, const TQString& name) const { int i = 0; - QStringList::ConstIterator iterator (value().begin()); + TQStringList::ConstIterator iterator (value().begin()); while ( iterator != value().end() ) { - config -> writeEntry ("Child" + QString::number (i), *iterator); + config -> writeEntry ("Child" + TQString::number (i), *iterator); ++ iterator; ++ i; } @@ -972,31 +972,31 @@ KPlayerIntegerStringMapProperty::~KPlayerIntegerStringMapProperty() { } -void KPlayerIntegerStringMapProperty::read (KConfig* config, const QString& name) +void KPlayerIntegerStringMapProperty::read (KConfig* config, const TQString& name) { - static QRegExp re_indexvalue ("^(\\d+)=(.*)$"); - QStringList values (QStringList::split (':', config -> readEntry (name))); - QStringList::ConstIterator iterator (values.begin()); + static TQRegExp re_indexvalue ("^(\\d+)=(.*)$"); + TQStringList values (TQStringList::split (':', config -> readEntry (name))); + TQStringList::ConstIterator iterator (values.begin()); while ( iterator != values.end() ) { if ( re_indexvalue.search (*iterator) >= 0 ) m_value.insert (re_indexvalue.cap (1).toInt(), re_indexvalue.cap (2)); else - m_value.insert ((*iterator).toInt(), QString::null); + m_value.insert ((*iterator).toInt(), TQString::null); ++ iterator; } } -void KPlayerIntegerStringMapProperty::save (KConfig* config, const QString& name) const +void KPlayerIntegerStringMapProperty::save (KConfig* config, const TQString& name) const { if ( value().count() > 1 || ! value().isEmpty() && ! ((KPlayerIntegerStringMapPropertyInfo*) KPlayerProperties::info (name)) -> multipleEntriesRequired() ) { - QStringList values; - QMap<int, QString>::ConstIterator iterator (value().begin()); + TQStringList values; + TQMap<int, TQString>::ConstIterator iterator (value().begin()); while ( iterator != value().end() ) { - QString value (QString::number (iterator.key())); + TQString value (TQString::number (iterator.key())); if ( ! iterator.data().isEmpty() ) value += "=" + iterator.data(); values.append (value); @@ -1010,7 +1010,7 @@ KPlayerUrlProperty::~KPlayerUrlProperty() { } -QString KPlayerUrlProperty::asString (void) const +TQString KPlayerUrlProperty::asString (void) const { return value().isLocalFile() ? value().path() : value().prettyURL(); } @@ -1026,12 +1026,12 @@ KPlayerPersistentUrlProperty::~KPlayerPersistentUrlProperty() { } -void KPlayerPersistentUrlProperty::read (KConfig* config, const QString& name) +void KPlayerPersistentUrlProperty::read (KConfig* config, const TQString& name) { setValue (KURL::fromPathOrURL (config -> readEntry (name, value().url()))); } -void KPlayerPersistentUrlProperty::save (KConfig* config, const QString& name) const +void KPlayerPersistentUrlProperty::save (KConfig* config, const TQString& name) const { config -> writeEntry (name, value().url()); } @@ -1041,7 +1041,7 @@ bool KPlayerPersistentUrlProperty::defaults (bool) return true; } -int KPlayerPropertyCounts::count (const QString& key) const +int KPlayerPropertyCounts::count (const TQString& key) const { KPlayerPropertyCounts::ConstIterator iterator = find (key); return iterator == end() ? 0 : iterator.data(); @@ -1166,8 +1166,8 @@ void KPlayerProperties::load (void) } if ( config() -> hasKey ("Keys") ) { - QStringList keys (config() -> readListEntry ("Keys", ';')); - QStringList::ConstIterator keysit (keys.begin()); + TQStringList keys (config() -> readListEntry ("Keys", ';')); + TQStringList::ConstIterator keysit (keys.begin()); while ( keysit != keys.end() ) { if ( config() -> hasKey (*keysit) ) @@ -1192,7 +1192,7 @@ void KPlayerProperties::save (void) const #endif config() -> deleteGroup (configGroup()); config() -> setGroup (configGroup()); - QStringList keys; + TQStringList keys; KPlayerPropertyMap::ConstIterator iterator (m_properties.begin()); while ( iterator != m_properties.end() ) { @@ -1204,7 +1204,7 @@ void KPlayerProperties::save (void) const if ( ! keys.isEmpty() ) config() -> writeEntry ("Keys", keys.join (";")); if ( config() == KPlayerEngine::engine() -> meta() && ! config() -> entryMap (configGroup()).isEmpty() ) - config() -> writeEntry ("Date", QDateTime::currentDateTime()); + config() -> writeEntry ("Date", TQDateTime::currentDateTime()); } void KPlayerProperties::commit (void) @@ -1257,28 +1257,28 @@ void KPlayerProperties::diff (KPlayerProperties* properties) update(); } -int KPlayerProperties::compare (KPlayerProperties* properties, const QString& key) const +int KPlayerProperties::compare (KPlayerProperties* properties, const TQString& key) const { KPlayerProperty* p = property (key); KPlayerProperty* property = properties -> property (key); return p && property ? p -> compare (property) : p ? -1 : property ? 1 : 0; } -QStringList KPlayerProperties::defaultOrder (void) +TQStringList KPlayerProperties::defaultOrder (void) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerProperties::defaultOrder\n"; #endif - QStringList order (defaultAttributes()); + TQStringList order (defaultAttributes()); order << ""; KPlayerPropertyInfoMap::ConstIterator iterator (m_info.constBegin()); while ( iterator != m_info.constEnd() ) { - const QString& name (iterator.key()); + const TQString& name (iterator.key()); KPlayerPropertyInfo* info = iterator.data(); if ( info -> canShow() && name != "Track" ) { - QStringList::Iterator it (order.begin()); + TQStringList::Iterator it (order.begin()); while ( it != order.end() ) { KPlayerPropertyInfo* i = KPlayerMedia::info (*it); @@ -1293,19 +1293,19 @@ QStringList KPlayerProperties::defaultOrder (void) return order; } -KPlayerPropertyInfo* KPlayerProperties::info (const QString& key) +KPlayerPropertyInfo* KPlayerProperties::info (const TQString& key) { KPlayerPropertyInfoMap::ConstIterator iterator = m_info.find (key); return iterator == m_info.end() ? &m_meta_info : *iterator; } -KPlayerProperty* KPlayerProperties::property (const QString& key) const +KPlayerProperty* KPlayerProperties::property (const TQString& key) const { KPlayerPropertyMap::ConstIterator iterator = m_properties.find (key); return iterator == m_properties.end() ? 0 : iterator.data(); } -KPlayerProperty* KPlayerProperties::get (const QString& key) +KPlayerProperty* KPlayerProperties::get (const TQString& key) { /*#ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerProperties::get " << key << "\n"; @@ -1324,7 +1324,7 @@ KPlayerProperty* KPlayerProperties::get (const QString& key) return p; } -void KPlayerProperties::reset (const QString& key) +void KPlayerProperties::reset (const TQString& key) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerProperties::reset " << key << "\n"; @@ -1348,7 +1348,7 @@ void KPlayerProperties::beginUpdate (void) m_previous.insert (iterator.key(), info (iterator.key()) -> copy (iterator.data())); } -void KPlayerProperties::updated (const QString& key) +void KPlayerProperties::updated (const TQString& key) { if ( m_previous.isEmpty() ) return; @@ -1368,12 +1368,12 @@ void KPlayerProperties::updated (const QString& key) } } -int KPlayerProperties::getBooleanOption (const QString& key) const +int KPlayerProperties::getBooleanOption (const TQString& key) const { return ! has (key) ? 0 : getBoolean (key) ? 1 : 2; } -void KPlayerProperties::setBooleanOption (const QString& key, int value) +void KPlayerProperties::setBooleanOption (const TQString& key, int value) { if ( value == 0 ) reset (key); @@ -1384,18 +1384,18 @@ void KPlayerProperties::setBooleanOption (const QString& key, int value) } } -void KPlayerProperties::set (const QString& key, int value) +void KPlayerProperties::set (const TQString& key, int value) { ((KPlayerIntegerProperty*) get (key)) -> setValue (value); updated (key); } -int KPlayerProperties::getIntegerOption (const QString& key) const +int KPlayerProperties::getIntegerOption (const TQString& key) const { return has (key) ? getInteger (key) + 1 : 0; } -void KPlayerProperties::setIntegerOption (const QString& key, int value) +void KPlayerProperties::setIntegerOption (const TQString& key, int value) { if ( value == 0 ) reset (key); @@ -1403,17 +1403,17 @@ void KPlayerProperties::setIntegerOption (const QString& key, int value) set (key, value - 1); } -int KPlayerProperties::getRelative (const QString& key) const +int KPlayerProperties::getRelative (const TQString& key) const { return limit (getRelativeValue (key), getInteger (key + " Minimum"), getInteger (key + " Maximum")); } -int KPlayerProperties::getRelativeOption (const QString& key) const +int KPlayerProperties::getRelativeOption (const TQString& key) const { return has (key) ? ((KPlayerRelativeProperty*) m_properties [key]) -> option() + 1 : 0; } -void KPlayerProperties::setRelativeOption (const QString& key, int value, int option) +void KPlayerProperties::setRelativeOption (const TQString& key, int value, int option) { if ( option == 0 || value == 0 && option > 1 && option < 4 ) reset (key); @@ -1426,7 +1426,7 @@ void KPlayerProperties::setRelativeOption (const QString& key, int value, int op } } -int KPlayerProperties::getCacheOption (const QString& key) const +int KPlayerProperties::getCacheOption (const TQString& key) const { return has (key) ? getCache (key) + 1 : 0; } @@ -1441,23 +1441,23 @@ void KPlayerProperties::setCacheOption (int cache, int size) setIntegerOption ("Cache", cache < 3 ? cache : size <= 0 ? 2 : size < 4 ? 5 : size + 1); } -void KPlayerProperties::set (const QString& key, float value) +void KPlayerProperties::set (const TQString& key, float value) { ((KPlayerFloatProperty*) get (key)) -> setValue (value); updated (key); } -const QSize& KPlayerProperties::getSize (const QString& key) const +const TQSize& KPlayerProperties::getSize (const TQString& key) const { return has (key) ? ((KPlayerSizeProperty*) m_properties [key]) -> value() : nullSize; } -int KPlayerProperties::getSizeOption (const QString& key) const +int KPlayerProperties::getSizeOption (const TQString& key) const { return has (key) ? ((KPlayerDisplaySizeProperty*) m_properties [key]) -> option() : 0; } -void KPlayerProperties::setSize (const QString& key, const QSize& value) +void KPlayerProperties::setSize (const TQString& key, const TQSize& value) { if ( value.isEmpty() ) reset (key); @@ -1468,7 +1468,7 @@ void KPlayerProperties::setSize (const QString& key, const QSize& value) } } -void KPlayerProperties::setSize (const QString& key, const QSize& value, int option) +void KPlayerProperties::setSize (const TQString& key, const TQSize& value, int option) { if ( value.isValid() && value.width() > 0 && option != 0 ) { @@ -1479,22 +1479,22 @@ void KPlayerProperties::setSize (const QString& key, const QSize& value, int opt reset (key); } -QSize KPlayerProperties::getDisplaySize (const QString& key) const +TQSize KPlayerProperties::getDisplaySize (const TQString& key) const { return getSize (key); } -QString KPlayerProperties::asString (const QString& key) const +TQString KPlayerProperties::asString (const TQString& key) const { - return has (key) ? ((KPlayerProperty*) m_properties [key]) -> asString() : QString::null; + return has (key) ? ((KPlayerProperty*) m_properties [key]) -> asString() : TQString::null; } -QString KPlayerProperties::asIntegerString (const QString& key) const +TQString KPlayerProperties::asIntegerString (const TQString& key) const { - return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> KPlayerIntegerProperty::asString() : QString::null; + return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> KPlayerIntegerProperty::asString() : TQString::null; } -void KPlayerProperties::fromString (const QString& key, const QString& value) +void KPlayerProperties::fromString (const TQString& key, const TQString& value) { if ( value.isEmpty() && has (key) || ! value.isEmpty() && value != asString (key) ) { @@ -1507,27 +1507,27 @@ void KPlayerProperties::fromString (const QString& key, const QString& value) } } -void KPlayerProperties::set (const QString& key, const QString& value) +void KPlayerProperties::set (const TQString& key, const TQString& value) { ((KPlayerStringProperty*) get (key)) -> setValue (value); updated (key); } -void KPlayerProperties::setString (const QString& key, const QString& value) +void KPlayerProperties::setString (const TQString& key, const TQString& value) { - const QString& d (stringInfo (key) -> defaultValue()); + const TQString& d (stringInfo (key) -> defaultValue()); if ( d.isNull() && value.isEmpty() || value == d ) reset (key); else set (key, value); } -const QString& KPlayerProperties::getStringValue (const QString& key) const +const TQString& KPlayerProperties::getStringValue (const TQString& key) const { - return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : QString::null; + return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : TQString::null; } -void KPlayerProperties::setComboValue (const QString& key, const QString& value) +void KPlayerProperties::setComboValue (const TQString& key, const TQString& value) { if ( value.isEmpty() ) reset (key); @@ -1535,17 +1535,17 @@ void KPlayerProperties::setComboValue (const QString& key, const QString& value) set (key, value); } -bool KPlayerProperties::hasComboValue (const QString& key) const +bool KPlayerProperties::hasComboValue (const TQString& key) const { return has (key) && ! ((KPlayerStringProperty*) m_properties [key]) -> value().isEmpty(); } -const QString& KPlayerProperties::getStringOption (const QString& key) const +const TQString& KPlayerProperties::getStringOption (const TQString& key) const { - return has (key) ? ((KPlayerComboStringProperty*) m_properties [key]) -> option() : QString::null; + return has (key) ? ((KPlayerComboStringProperty*) m_properties [key]) -> option() : TQString::null; } -void KPlayerProperties::setStringOption (const QString& key, const QString& value) +void KPlayerProperties::setStringOption (const TQString& key, const TQString& value) { if ( value.isNull() && ! hasComboValue (key) ) reset (key); @@ -1556,22 +1556,22 @@ void KPlayerProperties::setStringOption (const QString& key, const QString& valu } } -bool KPlayerProperties::hasComboString (const QString& key) const +bool KPlayerProperties::hasComboString (const TQString& key) const { return ! getComboString (key).isEmpty(); } -/*const QStringList& KPlayerProperties::getHistory (const QString& key) const +/*const TQStringList& KPlayerProperties::getHistory (const TQString& key) const { return has (key) ? ((KPlayerStringHistoryProperty*) m_properties [key]) -> history() : nullStringList; }*/ -int KPlayerProperties::getAppendableOption (const QString& key) const +int KPlayerProperties::getAppendableOption (const TQString& key) const { return ! has (key) ? 0 : ((KPlayerAppendableProperty*) m_properties [key]) -> option() ? 2 : 1; } -void KPlayerProperties::setAppendable (const QString& key, const QString& value, int option) +void KPlayerProperties::setAppendable (const TQString& key, const TQString& value, int option) { if ( option == 0 || option == 2 && value.isEmpty() ) reset (key); @@ -1582,18 +1582,18 @@ void KPlayerProperties::setAppendable (const QString& key, const QString& value, } } -const QStringList& KPlayerProperties::getStringList (const QString& key) const +const TQStringList& KPlayerProperties::getStringList (const TQString& key) const { return has (key) ? ((KPlayerStringListProperty*) m_properties [key]) -> value() : nullStringList; } -void KPlayerProperties::addStringListEntry (const QString& key, const QString& entry) +void KPlayerProperties::addStringListEntry (const TQString& key, const TQString& entry) { ((KPlayerStringListProperty*) get (key)) -> addEntry (entry); updated (key); } -void KPlayerProperties::setStringList (const QString& key, const QStringList& value) +void KPlayerProperties::setStringList (const TQString& key, const TQStringList& value) { if ( value.isEmpty() ) reset (key); @@ -1604,22 +1604,22 @@ void KPlayerProperties::setStringList (const QString& key, const QStringList& va } } -const QMap<int, QString>& KPlayerProperties::getIntegerStringMap (const QString& key) const +const TQMap<int, TQString>& KPlayerProperties::getIntegerStringMap (const TQString& key) const { return has (key) ? ((KPlayerIntegerStringMapProperty*) m_properties [key]) -> value() : nullIntegerStringMap; } -void KPlayerProperties::setIntegerStringMapKey (const QString& key, int id) +void KPlayerProperties::setIntegerStringMapKey (const TQString& key, int id) { KPlayerIntegerStringMapProperty* property = (KPlayerIntegerStringMapProperty*) get (key); if ( ! property -> value().contains (id) ) { - property -> setValue (id, QString::null); + property -> setValue (id, TQString::null); updated (key); } } -void KPlayerProperties::setIntegerStringMapKeyValue (const QString& key, int id, const QString& value) +void KPlayerProperties::setIntegerStringMapKeyValue (const TQString& key, int id, const TQString& value) { KPlayerIntegerStringMapProperty* property = (KPlayerIntegerStringMapProperty*) get (key); if ( property -> value() [id] != value ) @@ -1629,22 +1629,22 @@ void KPlayerProperties::setIntegerStringMapKeyValue (const QString& key, int id, } } -bool KPlayerProperties::hasIntegerStringMapKey (const QString& key, int id) const +bool KPlayerProperties::hasIntegerStringMapKey (const TQString& key, int id) const { return has (key) && ((KPlayerIntegerStringMapProperty*) m_properties [key]) -> value().contains (id); } -bool KPlayerProperties::hasIntegerStringMapValue (const QString& key, int id) const +bool KPlayerProperties::hasIntegerStringMapValue (const TQString& key, int id) const { return has (key) && ! ((KPlayerIntegerStringMapProperty*) m_properties [key]) -> value() [id].isEmpty(); } -const KURL& KPlayerProperties::getUrl (const QString& key) const +const KURL& KPlayerProperties::getUrl (const TQString& key) const { return has (key) ? ((KPlayerUrlProperty*) m_properties [key]) -> value() : nullUrl; } -void KPlayerProperties::setUrl (const QString& key, const KURL& value) +void KPlayerProperties::setUrl (const TQString& key, const KURL& value) { if ( value.isValid() ) { @@ -1655,22 +1655,22 @@ void KPlayerProperties::setUrl (const QString& key, const KURL& value) reset (key); } -bool KPlayerProperties::autoloadSubtitles (const QString&) const +bool KPlayerProperties::autoloadSubtitles (const TQString&) const { return false; } -bool KPlayerProperties::getVobsubSubtitles (const QString&, const KURL&) const +bool KPlayerProperties::getVobsubSubtitles (const TQString&, const KURL&) const { return false; } -bool KPlayerProperties::getPlaylist (const QString&, const KURL&) const +bool KPlayerProperties::getPlaylist (const TQString&, const KURL&) const { return false; } -bool KPlayerProperties::getUseKioslave (const QString&, const KURL&) const +bool KPlayerProperties::getUseKioslave (const TQString&, const KURL&) const { return false; } @@ -2195,17 +2195,17 @@ KConfig* KPlayerConfiguration::config (void) const return KPlayerEngine::engine() -> config(); } -QString KPlayerConfiguration::configGroup (void) const +TQString KPlayerConfiguration::configGroup (void) const { return "Player Options"; } -bool KPlayerConfiguration::getBoolean (const QString& key) const +bool KPlayerConfiguration::getBoolean (const TQString& key) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : booleanInfo (key) -> defaultValue(); } -void KPlayerConfiguration::setBoolean (const QString& key, bool value) +void KPlayerConfiguration::setBoolean (const TQString& key, bool value) { if ( value == (booleanInfo (key) -> defaultValue()) ) reset (key); @@ -2216,12 +2216,12 @@ void KPlayerConfiguration::setBoolean (const QString& key, bool value) } } -int KPlayerConfiguration::getInteger (const QString& key) const +int KPlayerConfiguration::getInteger (const TQString& key) const { return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> value() : integerInfo (key) -> defaultValue(); } -void KPlayerConfiguration::setInteger (const QString& key, int value) +void KPlayerConfiguration::setInteger (const TQString& key, int value) { if ( value == integerInfo (key) -> defaultValue() ) reset (key); @@ -2229,39 +2229,39 @@ void KPlayerConfiguration::setInteger (const QString& key, int value) set (key, value); } -int KPlayerConfiguration::getRelativeValue (const QString& key) const +int KPlayerConfiguration::getRelativeValue (const TQString& key) const { return getInteger (key); } -void KPlayerConfiguration::setRelative (const QString& key, int value) +void KPlayerConfiguration::setRelative (const TQString& key, int value) { setInteger (key, value); } -void KPlayerConfiguration::adjustRelative (const QString& key, int value) +void KPlayerConfiguration::adjustRelative (const TQString& key, int value) { setInteger (key, value); } -int KPlayerConfiguration::getCache (const QString& key) const +int KPlayerConfiguration::getCache (const TQString& key) const { int cache = has (key) ? ((KPlayerCacheProperty*) m_properties [key]) -> value() : integerInfo (key) -> defaultValue(); return cache > 2 ? 2 : cache; } -int KPlayerConfiguration::getCacheSize (const QString& key) const +int KPlayerConfiguration::getCacheSize (const TQString& key) const { int size = has (key) ? ((KPlayerCacheProperty*) m_properties [key]) -> value() : integerInfo (key) -> defaultValue(); return size > 3 ? size : 0; } -float KPlayerConfiguration::getFloat (const QString& key) const +float KPlayerConfiguration::getFloat (const TQString& key) const { return has (key) ? ((KPlayerFloatProperty*) m_properties [key]) -> value() : floatInfo (key) -> defaultValue(); } -void KPlayerConfiguration::setFloat (const QString& key, float value) +void KPlayerConfiguration::setFloat (const TQString& key, float value) { if ( value == floatInfo (key) -> defaultValue() ) reset (key); @@ -2269,46 +2269,46 @@ void KPlayerConfiguration::setFloat (const QString& key, float value) set (key, value); } -const QString& KPlayerConfiguration::getString (const QString& key) const +const TQString& KPlayerConfiguration::getString (const TQString& key) const { return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : stringInfo (key) -> defaultValue(); } -const QString& KPlayerConfiguration::getComboString (const QString& key) const +const TQString& KPlayerConfiguration::getComboString (const TQString& key) const { return getString (key); } -QString KPlayerConfiguration::getAppendable (const QString& key) const +TQString KPlayerConfiguration::getAppendable (const TQString& key) const { return getString (key); } -bool KPlayerConfiguration::autoloadSubtitles (const QString& key) const +bool KPlayerConfiguration::autoloadSubtitles (const TQString& key) const { return getBoolean (key); } -bool vobsub (const QString& path); +bool vobsub (const TQString& path); -bool KPlayerConfiguration::getVobsubSubtitles (const QString&, const KURL& url) const +bool KPlayerConfiguration::getVobsubSubtitles (const TQString&, const KURL& url) const { return url.isValid() && url.isLocalFile() && vobsub (url.path()); } -bool KPlayerConfiguration::getPlaylist (const QString&, const KURL& url) const +bool KPlayerConfiguration::getPlaylist (const TQString&, const KURL& url) const { - static QRegExp re_playlist_url ("^(?:file|http|http_proxy|ftp|smb):/.*\\.(?:ram|smi|smil|rpm|asx|wax|wvx|pls|m3u|strm)(?:\\?|$)", false); + static TQRegExp re_playlist_url ("^(?:file|http|http_proxy|ftp|smb):/.*\\.(?:ram|smi|smil|rpm|asx|wax|wvx|pls|m3u|strm)(?:\\?|$)", false); return re_playlist_url.search (url.url()) >= 0; } -bool KPlayerConfiguration::getUseKioslave (const QString&, const KURL& url) const +bool KPlayerConfiguration::getUseKioslave (const TQString&, const KURL& url) const { - static QRegExp re_remote_url ("^[A-Za-z]+:/"); - static QRegExp re_mplayer_url ("^(?:file|http_proxy|mms|mmst|mmsu|rtp|rtsp|sip|pnm|dvd|vcd|tv|dvb|mf|cdda|cddb|cue|sdp|mpst|tivo):/", false); - static QRegExp re_http_url ("^http:/", false); - static QRegExp re_ftp_url ("^ftp:/", false); - static QRegExp re_smb_url ("^smb:/", false); + static TQRegExp re_remote_url ("^[A-Za-z]+:/"); + static TQRegExp re_mplayer_url ("^(?:file|http_proxy|mms|mmst|mmsu|rtp|rtsp|sip|pnm|dvd|vcd|tv|dvb|mf|cdda|cddb|cue|sdp|mpst|tivo):/", false); + static TQRegExp re_http_url ("^http:/", false); + static TQRegExp re_ftp_url ("^ftp:/", false); + static TQRegExp re_smb_url ("^smb:/", false); if ( re_http_url.search (url.url()) >= 0 ) return configuration() -> useKioslaveForHttp(); if ( re_ftp_url.search (url.url()) >= 0 ) @@ -2343,11 +2343,11 @@ void KPlayerConfiguration::itemReset (void) } } -QStringList KPlayerConfiguration::subtitleExtensions (void) const +TQStringList KPlayerConfiguration::subtitleExtensions (void) const { - static QRegExp re_split ("\\s*[,;:. ]\\s*"); - QStringList exts, extlist (QStringList::split (re_split, autoloadExtensionList())); - QStringList::ConstIterator extiterator (extlist.constBegin()); + static TQRegExp re_split ("\\s*[,;:. ]\\s*"); + TQStringList exts, extlist (TQStringList::split (re_split, autoloadExtensionList())); + TQStringList::ConstIterator extiterator (extlist.constBegin()); while ( extiterator != extlist.constEnd() ) { if ( ! (*extiterator).isEmpty() ) @@ -2357,10 +2357,10 @@ QStringList KPlayerConfiguration::subtitleExtensions (void) const return exts; } -QSize KPlayerConfiguration::autoexpandAspect (void) const +TQSize KPlayerConfiguration::autoexpandAspect (void) const { int option = subtitleAutoexpand(); - return option == 1 ? QSize (1, 1) : option == 2 ? QSize (4, 3) : option == 3 ? QSize (16, 9) : QSize(); + return option == 1 ? TQSize (1, 1) : option == 2 ? TQSize (4, 3) : option == 3 ? TQSize (16, 9) : TQSize(); } int KPlayerConfiguration::sliderMarksInterval (int span) const @@ -2401,7 +2401,7 @@ void KPlayerMedia::setParent (KPlayerMedia* media) } } -QString KPlayerMedia::configGroup (void) const +TQString KPlayerMedia::configGroup (void) const { return url().url(); } @@ -2420,12 +2420,12 @@ bool KPlayerMedia::release (void) return result; } -bool KPlayerMedia::getBoolean (const QString& key) const +bool KPlayerMedia::getBoolean (const TQString& key) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getBoolean (key); } -void KPlayerMedia::setBoolean (const QString& key, bool value) +void KPlayerMedia::setBoolean (const TQString& key, bool value) { if ( value == parent() -> getBoolean (key) ) reset (key); @@ -2436,12 +2436,12 @@ void KPlayerMedia::setBoolean (const QString& key, bool value) } } -int KPlayerMedia::getInteger (const QString& key) const +int KPlayerMedia::getInteger (const TQString& key) const { return has (key) ? ((KPlayerIntegerProperty*) m_properties [key]) -> value() : parent() -> getInteger (key); } -void KPlayerMedia::setInteger (const QString& key, int value) +void KPlayerMedia::setInteger (const TQString& key, int value) { if ( value == parent() -> getInteger (key) ) reset (key); @@ -2449,13 +2449,13 @@ void KPlayerMedia::setInteger (const QString& key, int value) set (key, value); } -int KPlayerMedia::getRelativeValue (const QString& key) const +int KPlayerMedia::getRelativeValue (const TQString& key) const { int current = parent() -> getRelativeValue (key); return has (key) ? ((KPlayerRelativeProperty*) m_properties [key]) -> value (current) : current; } -void KPlayerMedia::setRelative (const QString& key, int value) +void KPlayerMedia::setRelative (const TQString& key, int value) { int current = parent() -> getRelativeValue (key); if ( value == current ) @@ -2467,7 +2467,7 @@ void KPlayerMedia::setRelative (const QString& key, int value) } } -void KPlayerMedia::adjustRelative (const QString& key, int value) +void KPlayerMedia::adjustRelative (const TQString& key, int value) { int option = getRelativeOption (key); if ( option == 1 ) @@ -2491,7 +2491,7 @@ void KPlayerMedia::adjustRelative (const QString& key, int value) } } -int KPlayerMedia::getCache (const QString& key) const +int KPlayerMedia::getCache (const TQString& key) const { if ( ! has (key) ) return parent() -> getCache (key); @@ -2499,7 +2499,7 @@ int KPlayerMedia::getCache (const QString& key) const return cache > 2 ? 2 : cache; } -int KPlayerMedia::getCacheSize (const QString& key) const +int KPlayerMedia::getCacheSize (const TQString& key) const { if ( ! has (key) ) return parent() -> getCacheSize (key); @@ -2507,12 +2507,12 @@ int KPlayerMedia::getCacheSize (const QString& key) const return size > 3 ? size : 0; } -float KPlayerMedia::getFloat (const QString& key) const +float KPlayerMedia::getFloat (const TQString& key) const { return has (key) ? ((KPlayerFloatProperty*) m_properties [key]) -> value() : parent() -> getFloat (key); } -void KPlayerMedia::setFloat (const QString& key, float value) +void KPlayerMedia::setFloat (const TQString& key, float value) { if ( value == parent() -> getFloat (key) ) reset (key); @@ -2520,25 +2520,25 @@ void KPlayerMedia::setFloat (const QString& key, float value) set (key, value); } -const QString& KPlayerMedia::getString (const QString& key) const +const TQString& KPlayerMedia::getString (const TQString& key) const { return has (key) ? ((KPlayerStringProperty*) m_properties [key]) -> value() : parent() -> getString (key); } -const QString& KPlayerMedia::getComboString (const QString& key) const +const TQString& KPlayerMedia::getComboString (const TQString& key) const { return has (key) ? ((KPlayerComboStringProperty*) m_properties [key]) -> option() : parent() -> getComboString (key); } -QString KPlayerMedia::getAppendable (const QString& key) const +TQString KPlayerMedia::getAppendable (const TQString& key) const { - QString current (parent() -> getAppendable (key)); + TQString current (parent() -> getAppendable (key)); return has (key) ? ((KPlayerAppendableProperty*) m_properties [key]) -> appendableValue (current) : current; } KPlayerGenericProperties* KPlayerMedia::genericProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerGenericProperties* properties = (KPlayerGenericProperties*) reference (urls); if ( ! properties ) { @@ -2551,7 +2551,7 @@ KPlayerGenericProperties* KPlayerMedia::genericProperties (const KURL& url) KPlayerDeviceProperties* KPlayerMedia::deviceProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDeviceProperties* properties = (KPlayerDeviceProperties*) reference (urls); if ( ! properties ) { @@ -2564,7 +2564,7 @@ KPlayerDeviceProperties* KPlayerMedia::deviceProperties (const KURL& url) KPlayerTVProperties* KPlayerMedia::tvProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerTVProperties* properties = (KPlayerTVProperties*) reference (urls); if ( ! properties ) { @@ -2577,7 +2577,7 @@ KPlayerTVProperties* KPlayerMedia::tvProperties (const KURL& url) KPlayerDVBProperties* KPlayerMedia::dvbProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDVBProperties* properties = (KPlayerDVBProperties*) reference (urls); if ( ! properties ) { @@ -2590,7 +2590,7 @@ KPlayerDVBProperties* KPlayerMedia::dvbProperties (const KURL& url) KPlayerDiskProperties* KPlayerMedia::diskProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDiskProperties* properties = (KPlayerDiskProperties*) reference (urls); if ( ! properties ) { @@ -2603,7 +2603,7 @@ KPlayerDiskProperties* KPlayerMedia::diskProperties (const KURL& url) KPlayerDiskProperties* KPlayerMedia::diskProperties (KPlayerDeviceProperties* parent, const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerDiskProperties* properties = (KPlayerDiskProperties*) reference (urls); if ( properties ) properties -> setParent (parent); @@ -2619,7 +2619,7 @@ KPlayerDiskProperties* KPlayerMedia::diskProperties (KPlayerDeviceProperties* pa KPlayerTrackProperties* KPlayerMedia::trackProperties (const KURL& url) { - QString urls (url.url()); + TQString urls (url.url()); KPlayerTrackProperties* properties = (KPlayerTrackProperties*) reference (urls); if ( ! properties ) { @@ -2647,7 +2647,7 @@ KPlayerTrackProperties* KPlayerMedia::trackProperties (const KURL& url) return properties; } -KPlayerMedia* KPlayerMedia::reference (const QString& urls) +KPlayerMedia* KPlayerMedia::reference (const TQString& urls) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerMedia::reference\n"; @@ -2668,7 +2668,7 @@ KPlayerMedia* KPlayerMedia::reference (const QString& urls) void KPlayerMedia::release (KPlayerMedia* media) { - QString urls (media -> url().url()); + TQString urls (media -> url().url()); if ( media -> release() ) m_media_map.remove (urls); } @@ -2693,17 +2693,17 @@ KConfig* KPlayerGenericProperties::config (void) const return KPlayerEngine::engine() -> store(); } -QString KPlayerGenericProperties::defaultName (void) const +TQString KPlayerGenericProperties::defaultName (void) const { return ! m_default_name.isEmpty() ? m_default_name : url().fileName().isEmpty() ? url().prettyURL() : url().fileName(); } -QString KPlayerGenericProperties::type (const QString& id) const +TQString KPlayerGenericProperties::type (const TQString& id) const { KURL u (url()); u.addPath (id); - QString urls (u.url()); + TQString urls (u.url()); KPlayerMediaMap::ConstIterator iterator = m_media_map.find (urls); if ( iterator != m_media_map.end() ) return ((KPlayerMediaProperties*) *iterator) -> type(); @@ -2711,7 +2711,7 @@ QString KPlayerGenericProperties::type (const QString& id) const return config() -> readEntry ("Type"); } -float KPlayerGenericProperties::msf (const QString& id) const +float KPlayerGenericProperties::msf (const TQString& id) const { KURL u (url()); u.addPath (id); @@ -2719,7 +2719,7 @@ float KPlayerGenericProperties::msf (const QString& id) const return config() -> readDoubleNumEntry ("MSF"); } -bool KPlayerGenericProperties::hidden (const QString& id) const +bool KPlayerGenericProperties::hidden (const TQString& id) const { KURL u (url()); u.addPath (id); @@ -2727,7 +2727,7 @@ bool KPlayerGenericProperties::hidden (const QString& id) const return config() -> readBoolEntry ("Hidden"); } -void KPlayerGenericProperties::setHidden (const QString& id, bool hidden) +void KPlayerGenericProperties::setHidden (const TQString& id, bool hidden) { KURL u (url()); u.addPath (id); @@ -2735,9 +2735,9 @@ void KPlayerGenericProperties::setHidden (const QString& id, bool hidden) return config() -> writeEntry ("Hidden", hidden); } -QString KPlayerGenericProperties::caption (void) const +TQString KPlayerGenericProperties::caption (void) const { - QString n (currentName()); + TQString n (currentName()); if ( n.isEmpty() && url().isLocalFile() ) n = url().path(); if ( n.isEmpty() ) @@ -2745,7 +2745,7 @@ QString KPlayerGenericProperties::caption (void) const return n; } -QString KPlayerGenericProperties::icon (void) const +TQString KPlayerGenericProperties::icon (void) const { return getString ("Icon"); } @@ -2765,24 +2765,24 @@ KPlayerMediaProperties::~KPlayerMediaProperties() #endif } -void KPlayerMediaProperties::setDisplaySize (const QSize& size, int option) +void KPlayerMediaProperties::setDisplaySize (const TQSize& size, int option) { setSize ("Display Size", size, option); } -QString KPlayerMediaProperties::demuxerString (void) const +TQString KPlayerMediaProperties::demuxerString (void) const { return demuxerOption(); //if ( ! demuxer.isEmpty() ) // demuxer += ","; } -QString KPlayerMediaProperties::audioDriverString (void) const +TQString KPlayerMediaProperties::audioDriverString (void) const { - QString driver (audioDriver()); + TQString driver (audioDriver()); if ( ! driver.isEmpty() ) { - QString device (audioDevice()); + TQString device (audioDevice()); if ( ! device.isEmpty() ) { device.replace (',', '.'); @@ -2796,29 +2796,29 @@ QString KPlayerMediaProperties::audioDriverString (void) const return driver; } -QString KPlayerMediaProperties::mixerChannelString (void) const +TQString KPlayerMediaProperties::mixerChannelString (void) const { - static QRegExp re_mixer_channel ("^(.*) +([0-9]+)$"); - QString channel (mixerChannel()); + static TQRegExp re_mixer_channel ("^(.*) +([0-9]+)$"); + TQString channel (mixerChannel()); if ( re_mixer_channel.search (channel) >= 0 ) channel = re_mixer_channel.cap(1) + "," + re_mixer_channel.cap(2); return channel; } -QString KPlayerMediaProperties::audioCodecString (void) const +TQString KPlayerMediaProperties::audioCodecString (void) const { - QString codec (audioCodecOption()); + TQString codec (audioCodecOption()); if ( ! codec.isEmpty() ) codec += ","; return codec; } -QString KPlayerMediaProperties::videoDriverString (void) const +TQString KPlayerMediaProperties::videoDriverString (void) const { - QString driver (videoDriver()); + TQString driver (videoDriver()); if ( ! driver.isEmpty() ) { - QString device (videoDevice()); + TQString device (videoDevice()); if ( ! device.isEmpty() ) { device.replace (',', '.'); @@ -2832,9 +2832,9 @@ QString KPlayerMediaProperties::videoDriverString (void) const return driver; } -QString KPlayerMediaProperties::videoCodecString (void) const +TQString KPlayerMediaProperties::videoCodecString (void) const { - QString codec (videoCodecOption()); + TQString codec (videoCodecOption()); if ( ! codec.isEmpty() ) codec += ","; return codec; @@ -2859,7 +2859,7 @@ KPlayerDeviceProperties::~KPlayerDeviceProperties() void KPlayerDeviceProperties::setupInfo (void) { KPlayerMediaProperties::setupInfo(); - setPath ("/" + m_url.path().section ('/', 1, 0xffffffff, QString::SectionSkipEmpty)); + setPath ("/" + m_url.path().section ('/', 1, 0xffffffff, TQString::SectionSkipEmpty)); } KPlayerTunerProperties::KPlayerTunerProperties (KPlayerProperties* parent, const KURL& url) @@ -2877,9 +2877,9 @@ KPlayerTunerProperties::~KPlayerTunerProperties() #endif } -int KPlayerTunerProperties::channelFrequency (const QString& id) const +int KPlayerTunerProperties::channelFrequency (const TQString& id) const { - QMap<QString, int>::ConstIterator iterator = m_frequencies.find (id); + TQMap<TQString, int>::ConstIterator iterator = m_frequencies.find (id); if ( iterator == m_frequencies.end() ) { ((KPlayerTunerProperties*) this) -> channels(); @@ -3068,12 +3068,12 @@ KPlayerTVProperties::~KPlayerTVProperties() #endif } -QString KPlayerTVProperties::channelListFromCountry (void) +TQString KPlayerTVProperties::channelListFromCountry (void) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTVProperties::channelListFromCountry\n"; #endif - QString country (KGlobal::locale() -> country().lower()); + TQString country (KGlobal::locale() -> country().lower()); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Country " << country << "\n"; #endif @@ -3097,16 +3097,16 @@ void KPlayerTVProperties::setupMeta (void) setChannelList (channelListFromCountry()); } -QStringList KPlayerTVProperties::channels (void) +TQStringList KPlayerTVProperties::channels (void) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTVProperties::channels\n"; kdDebugTime() << " URL " << url() << "\n"; #endif m_frequencies.clear(); - QString id; - QStringList channels; - const QString& channellist (channelList()); + TQString id; + TQStringList channels; + const TQString& channellist (channelList()); for ( uint i = 0; i < channellistcount; i ++ ) { const struct KPlayerChannelList& list = channellists[i]; @@ -3120,14 +3120,14 @@ QStringList KPlayerTVProperties::channels (void) { if ( group.first_channel >= 0 ) { - id = QString::number (c + group.first_channel).rightJustify (group.digits, '0'); + id = TQString::number (c + group.first_channel).rightJustify (group.digits, '0'); if ( group.prefix ) id = group.prefix + id; } else { id = group.prefix; - QChar& lastchr (id.ref (id.length() - 1)); + TQChar& lastchr (id.ref (id.length() - 1)); lastchr = lastchr.unicode() + c; } channels.append (id); @@ -3163,10 +3163,10 @@ void KPlayerDVBProperties::setupMeta (void) #endif if ( ! hasChannelList() ) { - QString paths[] = { QDir::homeDirPath() + "/.mplayer", "/etc/mplayer", "/usr/local/etc/mplayer" }; + TQString paths[] = { TQDir::homeDirPath() + "/.mplayer", "/etc/mplayer", "/usr/local/etc/mplayer" }; const char* globs[] = { "channels.conf", "channels.conf.sat", "channels.conf.ter", "channels.conf.cbl", "channels.conf.atsc", "channels.conf.*", "channels.conf*", "*channels.conf" }; - for ( uint i = 0; i < sizeof (paths) / sizeof (QString); i ++ ) + for ( uint i = 0; i < sizeof (paths) / sizeof (TQString); i ++ ) { #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Looking for channels file in " << paths[i] << "\n"; @@ -3176,14 +3176,14 @@ void KPlayerDVBProperties::setupMeta (void) #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Checking " << globs[j] << "\n"; #endif - QDir dir (paths[i], globs[j], QDir::Unsorted, QDir::Files); - const QFileInfoList* list = dir.entryInfoList(); + TQDir dir (paths[i], globs[j], TQDir::Unsorted, TQDir::Files); + const TQFileInfoList* list = dir.entryInfoList(); if ( list ) { - QFileInfoListIterator it (*list); - while ( QFileInfo* info = it.current() ) + TQFileInfoListIterator it (*list); + while ( TQFileInfo* info = it.current() ) { - QString path (info -> filePath()); + TQString path (info -> filePath()); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Verifying " << path << "\n"; #endif @@ -3203,20 +3203,20 @@ void KPlayerDVBProperties::setupMeta (void) } } -QStringList KPlayerDVBProperties::channels (void) +TQStringList KPlayerDVBProperties::channels (void) { - static QRegExp re_channel ("^([^#:][^:]*):(\\d+):"); + static TQRegExp re_channel ("^([^#:][^:]*):(\\d+):"); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerDVBProperties::channels\n"; kdDebugTime() << " URL " << url() << "\n"; #endif m_names.clear(); m_frequencies.clear(); - QStringList channels; + TQStringList channels; if ( hasChannelList() ) { - QString id; - QFile file (channelList()); + TQString id; + TQFile file (channelList()); file.open (IO_ReadOnly); while ( file.readLine (id, 1024) >= 0 ) { @@ -3225,16 +3225,16 @@ QStringList KPlayerDVBProperties::channels (void) #endif if ( re_channel.search (id) >= 0 ) { - QString name (re_channel.cap(1)); + TQString name (re_channel.cap(1)); int frequency = re_channel.cap(2).toInt(); if ( frequency > 20000000 ) frequency /= 1000; - QString base (name); + TQString base (name); base = base.replace ('/', '-').simplifyWhiteSpace(); id = base; int i = 0; while ( m_names.contains (id) ) - id = base + QString::number (i ++); + id = base + TQString::number (i ++); channels.append (id); m_names.insert (id, name); m_frequencies.insert (id, frequency); @@ -3300,7 +3300,7 @@ KPlayerTrackProperties::~KPlayerTrackProperties() #endif } -void KPlayerTrackProperties::setDisplaySize (const QSize& size, int option) +void KPlayerTrackProperties::setDisplaySize (const TQSize& size, int option) { if ( ! size.isEmpty() && hasOriginalSize() && (option == 1 && currentSize() == size || option == 2 && size.width() * currentSize().height() == size.height() * currentSize().width()) ) @@ -3314,19 +3314,19 @@ KConfig* KPlayerTrackProperties::config (void) const return KPlayerEngine::engine() -> meta(); } -QString KPlayerTrackProperties::deviceOption (void) const +TQString KPlayerTrackProperties::deviceOption (void) const { - return QString::null; + return TQString::null; } -QString KPlayerTrackProperties::deviceSetting (void) const +TQString KPlayerTrackProperties::deviceSetting (void) const { - return QString::null; + return TQString::null; } -QString KPlayerTrackProperties::extension (void) const +TQString KPlayerTrackProperties::extension (void) const { - return QFileInfo (url().fileName()).extension(false).lower(); + return TQFileInfo (url().fileName()).extension(false).lower(); } void KPlayerTrackProperties::setupMeta (void) @@ -3337,9 +3337,9 @@ void KPlayerTrackProperties::setupMeta (void) m_height_adjusted = hasOriginalSize(); } -void KPlayerTrackProperties::importMeta (QString key, QString value) +void KPlayerTrackProperties::importMeta (TQString key, TQString value) { - static QRegExp re_track ("^(?:Track|Pista) *[0-9]*$", false); + static TQRegExp re_track ("^(?:Track|Pista) *[0-9]*$", false); key = key.lower(); capitalizeWords (key); if ( key == "Layer" || key == "Version" || key == "Comment" || key == "Comments" @@ -3394,7 +3394,7 @@ void KPlayerTrackProperties::importMeta (QString key, QString value) } else { - QString lovalue (value.lower()); + TQString lovalue (value.lower()); if ( lovalue != "no title" && lovalue != "title" && lovalue != "artist" && lovalue != "album" && lovalue != "genre" && lovalue != "various artists" && lovalue != "various" && lovalue != "unknown" && lovalue != "other" @@ -3409,37 +3409,37 @@ void KPlayerTrackProperties::importMeta (QString key, QString value) } } -void KPlayerTrackProperties::extractMeta (const QString& str, bool update) +void KPlayerTrackProperties::extractMeta (const TQString& str, bool update) { - static QRegExp re_video ("^V(?:IDE)?O: *\\S+ +(\\d+)x(\\d+)"); - static QRegExp re_vo ("^V(?:IDE)?O:.* (\\d+)x(\\d+) +=> +(\\d+)x(\\d+)"); - static QRegExp re_vc ("^(?:ID_VIDEO_CODEC=|Selected video codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); - static QRegExp re_ac ("^(?:ID_AUDIO_CODEC=|Selected audio codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); + static TQRegExp re_video ("^V(?:IDE)?O: *\\S+ +(\\d+)x(\\d+)"); + static TQRegExp re_vo ("^V(?:IDE)?O:.* (\\d+)x(\\d+) +=> +(\\d+)x(\\d+)"); + static TQRegExp re_vc ("^(?:ID_VIDEO_CODEC=|Selected video codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); + static TQRegExp re_ac ("^(?:ID_AUDIO_CODEC=|Selected audio codec: \\[)([A-Za-z0-9,:.-]+)(?:$|\\])"); #ifdef KPLAYER_PROCESS_SIZE_IDS - static QRegExp re_vw ("^ID_VIDEO_WIDTH=(\\d+)$"); - static QRegExp re_vh ("^ID_VIDEO_HEIGHT=(\\d+)$"); - static QRegExp re_va ("^ID_VIDEO_ASPECT=([0-9.]+)$"); + static TQRegExp re_vw ("^ID_VIDEO_WIDTH=(\\d+)$"); + static TQRegExp re_vh ("^ID_VIDEO_HEIGHT=(\\d+)$"); + static TQRegExp re_va ("^ID_VIDEO_ASPECT=([0-9.]+)$"); #endif - static QRegExp re_vbr ("^ID_VIDEO_BITRATE=(\\d+)$"); - static QRegExp re_vfr ("^ID_VIDEO_FPS=([0-9.]+)$"); - static QRegExp re_vid ("^ID_VIDEO_ID=(\\d+)$"); - static QRegExp re_abr ("^ID_AUDIO_BITRATE=(\\d+)$"); - static QRegExp re_asr ("^ID_AUDIO_RATE=(\\d+)$"); - static QRegExp re_ach ("^ID_AUDIO_NCH=(\\d+)$"); - static QRegExp re_aid ("^ID_AUDIO_ID=(\\d+)$"); - static QRegExp re_alang ("^ID_AID_(\\d+)_LANG=(.+)$"); - static QRegExp re_sid ("^ID_SUBTITLE_ID=(\\d+)$"); - static QRegExp re_slang ("^ID_SID_(\\d+)_LANG=(.+)$"); - static QRegExp re_vsid ("^ID_VOBSUB_ID=(\\d+)$"); - static QRegExp re_vslang ("^ID_VSID_(\\d+)_LANG=(.+)$"); - static QRegExp re_length ("^(?:ID|ANS)_LENGTH=(\\d+\\.?\\d*)$"); - static QRegExp re_demuxer ("^ID_DEMUXER=(.+)$"); - static QRegExp re_name_sc ("^Name *: *(.+)$"); - static QRegExp re_name ("^ID_CLIP_INFO_NAME[0-9]+=(.+)$"); - static QRegExp re_value ("^ID_CLIP_INFO_VALUE[0-9]+=(.+)$"); - static QRegExp re_icyinfo ("^ICY Info: StreamTitle='([^']*)'"); + static TQRegExp re_vbr ("^ID_VIDEO_BITRATE=(\\d+)$"); + static TQRegExp re_vfr ("^ID_VIDEO_FPS=([0-9.]+)$"); + static TQRegExp re_vid ("^ID_VIDEO_ID=(\\d+)$"); + static TQRegExp re_abr ("^ID_AUDIO_BITRATE=(\\d+)$"); + static TQRegExp re_asr ("^ID_AUDIO_RATE=(\\d+)$"); + static TQRegExp re_ach ("^ID_AUDIO_NCH=(\\d+)$"); + static TQRegExp re_aid ("^ID_AUDIO_ID=(\\d+)$"); + static TQRegExp re_alang ("^ID_AID_(\\d+)_LANG=(.+)$"); + static TQRegExp re_sid ("^ID_SUBTITLE_ID=(\\d+)$"); + static TQRegExp re_slang ("^ID_SID_(\\d+)_LANG=(.+)$"); + static TQRegExp re_vsid ("^ID_VOBSUB_ID=(\\d+)$"); + static TQRegExp re_vslang ("^ID_VSID_(\\d+)_LANG=(.+)$"); + static TQRegExp re_length ("^(?:ID|ANS)_LENGTH=(\\d+\\.?\\d*)$"); + static TQRegExp re_demuxer ("^ID_DEMUXER=(.+)$"); + static TQRegExp re_name_sc ("^Name *: *(.+)$"); + static TQRegExp re_name ("^ID_CLIP_INFO_NAME[0-9]+=(.+)$"); + static TQRegExp re_value ("^ID_CLIP_INFO_VALUE[0-9]+=(.+)$"); + static TQRegExp re_icyinfo ("^ICY Info: StreamTitle='([^']*)'"); static int width = 0; - static QString key; + static TQString key; static bool seen_length = false; if ( str.startsWith ("ID_FILENAME=") ) seen_length = false; @@ -3470,8 +3470,8 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) } else if ( (update || ! heightAdjusted()) && re_vo.search (str) >= 0 ) { - QSize res (re_vo.cap(1).toInt(), re_vo.cap(2).toInt()); - QSize size (re_vo.cap(3).toInt(), re_vo.cap(4).toInt()); + TQSize res (re_vo.cap(1).toInt(), re_vo.cap(2).toInt()); + TQSize size (re_vo.cap(3).toInt(), re_vo.cap(4).toInt()); if ( res == resolution() ) { setOriginalSize (size); @@ -3493,7 +3493,7 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) } else if ( (update || ! hasResolution()) && re_video.search (str) >= 0 ) { - setResolution (QSize (re_video.cap(1).toInt(), re_video.cap(2).toInt())); + setResolution (TQSize (re_video.cap(1).toInt(), re_video.cap(2).toInt())); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Width " << resolution().width() << " Height " << resolution().height() << "\n"; #endif @@ -3508,7 +3508,7 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) } else if ( width > 0 && resolution().height() <= 0 && re_vh.search (str) >= 0 ) { - setResolution (QSize (width, re_vh.cap(1).toInt())); + setResolution (TQSize (width, re_vh.cap(1).toInt())); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Height " << resolution().height() << "\n"; #endif @@ -3535,7 +3535,7 @@ void KPlayerTrackProperties::extractMeta (const QString& str, bool update) #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Aspect " << a << " (" << w << "x" << h << ")\n"; #endif - setOriginalSize (QSize (resolution().width(), (resolution().width() * h + w / 2) / w)); + setOriginalSize (TQSize (resolution().width(), (resolution().width() * h + w / 2) / w)); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "Process: Adjusted height " << originalSize().height() << "\n"; #endif @@ -3713,22 +3713,22 @@ int KPlayerTrackProperties::fastSeek (void) const return seek; } -QSize KPlayerTrackProperties::getDisplaySize (const QString& key) const +TQSize KPlayerTrackProperties::getDisplaySize (const TQString& key) const { - const QSize& current (currentSize()); + const TQSize& current (currentSize()); return has (key) ? ((KPlayerDisplaySizeProperty*) m_properties [key]) -> value (current) : current; } -int KPlayerTrackProperties::getTrackOption (const QString& key) const +int KPlayerTrackProperties::getTrackOption (const TQString& key) const { if ( has (key) ) { int i = 1; - const QMap<int, QString>& ids (getIntegerStringMap (key + "s")); + const TQMap<int, TQString>& ids (getIntegerStringMap (key + "s")); if ( ids.count() > 1 ) { int id = getInteger (key); - QMap<int, QString>::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + TQMap<int, TQString>::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end && iterator.key() != id ) { ++ iterator; @@ -3740,15 +3740,15 @@ int KPlayerTrackProperties::getTrackOption (const QString& key) const return 0; } -void KPlayerTrackProperties::setTrackOption (const QString& key, int value) +void KPlayerTrackProperties::setTrackOption (const TQString& key, int value) { if ( value == 0 ) reset (key); else { int i = 1, id = 0; - const QMap<int, QString>& ids (getIntegerStringMap (key + "s")); - QMap<int, QString>::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); + const TQMap<int, TQString>& ids (getIntegerStringMap (key + "s")); + TQMap<int, TQString>::ConstIterator iterator (ids.constBegin()), end (ids.constEnd()); while ( iterator != end && value != i ) { id = iterator.key(); @@ -3813,11 +3813,11 @@ void KPlayerTrackProperties::showSubtitleUrl (const KURL& url) bool KPlayerTrackProperties::needsExpanding (void) const { - //static QRegExp re_expand ("(?:^| )-vf +(?:[^ ]*,)?expand="); + //static TQRegExp re_expand ("(?:^| )-vf +(?:[^ ]*,)?expand="); if ( hasOriginalSize() && configuration() -> hasSubtitleAutoexpand() ) { - QSize aspect = configuration() -> autoexpandAspect(); - QSize size = hasDisplaySize() ? displaySize() : currentSize(); + TQSize aspect = configuration() -> autoexpandAspect(); + TQSize size = hasDisplaySize() ? displaySize() : currentSize(); return size.height() * aspect.width() * 20 < size.width() * aspect.height() * 19; } return false; @@ -3825,15 +3825,15 @@ bool KPlayerTrackProperties::needsExpanding (void) const void KPlayerTrackProperties::autoexpand (void) { - static QRegExp re_expand ("((?:^|.* )-vf +[^ ]+)(.*)"); + static TQRegExp re_expand ("((?:^|.* )-vf +[^ ]+)(.*)"); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTrackProperties::autoexpand\n"; #endif if ( hasOriginalSize() && configuration() -> hasSubtitleAutoexpand() ) { - QSize aspect = configuration() -> autoexpandAspect(); - const QSize& res = currentResolution(); - const QSize& size = currentSize(); + TQSize aspect = configuration() -> autoexpandAspect(); + const TQSize& res = currentResolution(); + const TQSize& size = currentSize(); int height = size.width() * aspect.height() * res.height() / (aspect.width() * size.height()); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Resolution " << res.width() << "x" << res.height() << "\n"; @@ -3842,7 +3842,7 @@ void KPlayerTrackProperties::autoexpand (void) #endif if ( height > res.height() ) { - QString expand = "expand=" + QString::number (res.width()) + ":" + QString::number (height); + TQString expand = "expand=" + TQString::number (res.width()) + ":" + TQString::number (height); int offset = res.width() / 10; height -= res.height(); if ( offset + offset > height ) @@ -3851,7 +3851,7 @@ void KPlayerTrackProperties::autoexpand (void) offset = height; if ( subtitlePosition() > 50 ) offset = height - offset; - expand += ":0:" + QString::number (offset); + expand += ":0:" + TQString::number (offset); } #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << " Expand " << expand << "\n"; @@ -3862,8 +3862,8 @@ void KPlayerTrackProperties::autoexpand (void) setCommandLine (re_expand.cap(1) + "," + expand + re_expand.cap(2)); else setCommandLine (commandLineValue() + " -vf " + expand); - setCurrentResolution (QSize (size.width(), height)); - setCurrentSize (QSize (size.width(), size.width() * aspect.height() / aspect.width())); + setCurrentResolution (TQSize (size.width(), height)); + setCurrentSize (TQSize (size.width(), size.width() * aspect.height() / aspect.width())); resetDisplaySize(); } } @@ -3894,24 +3894,24 @@ void KPlayerDiskTrackProperties::setupInfo (void) : i18n("Track %1")).arg (url().fileName().rightJustify (parent() -> digits(), '0'))); } -QString KPlayerDiskTrackProperties::icon (void) const +TQString KPlayerDiskTrackProperties::icon (void) const { return parent() -> getString ("Type") == "Audio CD" ? "sound" : "video"; } -QString KPlayerDiskTrackProperties::deviceOption (void) const +TQString KPlayerDiskTrackProperties::deviceOption (void) const { return parent() -> type() == "DVD" ? "-dvd-device" : "-cdrom-device"; } -QString KPlayerDiskTrackProperties::deviceSetting (void) const +TQString KPlayerDiskTrackProperties::deviceSetting (void) const { return parent() -> pathString(); } -QString KPlayerDiskTrackProperties::urlString (void) const +TQString KPlayerDiskTrackProperties::urlString (void) const { - const QString& type = parent() -> type(); + const TQString& type = parent() -> type(); return (type == "DVD" ? "dvd://" : type == "Video CD" ? "vcd://" : "cdda://") + url().fileName(); } @@ -3931,7 +3931,7 @@ KPlayerChannelProperties::~KPlayerChannelProperties() #endif } -QString KPlayerChannelProperties::icon (void) const +TQString KPlayerChannelProperties::icon (void) const { return "video"; } @@ -3969,14 +3969,14 @@ KPlayerTVChannelProperties::~KPlayerTVChannelProperties() void KPlayerTVChannelProperties::setupInfo (void) { - static QRegExp re_channel ("^([A-Z]*)(\\d+)([A-Z]*)$"); + static TQRegExp re_channel ("^([A-Z]*)(\\d+)([A-Z]*)$"); #ifdef DEBUG_KPLAYER_PROPERTIES kdDebugTime() << "KPlayerTVChannelProperties::setupInfo\n"; #endif KPlayerChannelProperties::setupInfo(); - QString id (url().fileName()); + TQString id (url().fileName()); setDefaultName (i18n("Channel %1").arg (re_channel.search (id) < 0 ? id : re_channel.cap(1) - + QString::number (re_channel.cap(2).toInt()).rightJustify (re_channel.cap(1).isEmpty() ? parent() -> digits() + + TQString::number (re_channel.cap(2).toInt()).rightJustify (re_channel.cap(1).isEmpty() ? parent() -> digits() : re_channel.cap(1) == "H" && re_channel.cap(2).length() == 1 ? 1 : 2, '0') + re_channel.cap(3))); setDefaultFrequency (parent() -> channelFrequency (id)); } @@ -3986,16 +3986,16 @@ bool KPlayerTVChannelProperties::canChangeFrequency (void) const return true; } -QString KPlayerTVChannelProperties::deviceOption (void) const +TQString KPlayerTVChannelProperties::deviceOption (void) const { return "-tv"; } -QString KPlayerTVChannelProperties::deviceSetting (void) const +TQString KPlayerTVChannelProperties::deviceSetting (void) const { - QString setting = "driver=" + inputDriver() + ":device=" + parent() -> pathString(); + TQString setting = "driver=" + inputDriver() + ":device=" + parent() -> pathString(); if ( frequency() != defaultFrequency() ) - setting += ":freq=" + QString::number (frequency()); + setting += ":freq=" + TQString::number (frequency()); else setting += ":chanlist=" + channelList() + ":channel=" + url().fileName(); if ( hasVideoNorm() || parent() -> hasVideoNorm() ) @@ -4004,31 +4004,31 @@ QString KPlayerTVChannelProperties::deviceSetting (void) const "PAL-BG", "PAL-DK", "PAL-I", "PAL-M", "PAL-N", "PAL-NC", "SECAM" }; int norm = videoNorm(); if ( norm >= 0 ) - setting += ":normid=" + QString::number (videoNorm()); + setting += ":normid=" + TQString::number (videoNorm()); else if ( norm < -1 && norm > - int (sizeof (norms) / sizeof (const char*)) - 2 ) - setting += QString (":norm=") + norms [- norm - 2]; + setting += TQString (":norm=") + norms [- norm - 2]; } if ( hasVideoFormat() || parent() -> hasVideoFormat() ) setting += ":outfmt=" + videoFormat(); if ( hasVideoInput() || parent() -> hasVideoInput() ) - setting += ":input=" + QString::number (videoInput()); + setting += ":input=" + TQString::number (videoInput()); if ( hasAudioMode() || parent() -> hasAudioMode() ) - setting += ":amode=" + QString::number (audioMode()) + ":forceaudio"; + setting += ":amode=" + TQString::number (audioMode()) + ":forceaudio"; if ( hasAudioInput() || parent() -> hasAudioInput() ) - setting += ":audioid=" + QString::number (audioInput()); - setting += QString (":immediatemode=") + (immediateMode() ? "1" : "0"); + setting += ":audioid=" + TQString::number (audioInput()); + setting += TQString (":immediatemode=") + (immediateMode() ? "1" : "0"); if ( alsaCapture() ) setting += ":alsa"; if ( hasCaptureDevice() || parent() -> hasCaptureDevice() ) setting += ":adevice=" + captureDevice(); if ( hasMjpegDecimation() || parent() -> hasMjpegDecimation() ) - setting += ":mjpeg:decimation=" + QString::number (mjpegDecimation()); + setting += ":mjpeg:decimation=" + TQString::number (mjpegDecimation()); if ( hasMjpegQuality() || parent() -> hasMjpegQuality() ) - setting += ":quality=" + QString::number (mjpegQuality()); + setting += ":quality=" + TQString::number (mjpegQuality()); return setting; } -QString KPlayerTVChannelProperties::urlString (void) const +TQString KPlayerTVChannelProperties::urlString (void) const { return "tv://"; } @@ -4054,7 +4054,7 @@ void KPlayerDVBChannelProperties::setupInfo (void) kdDebugTime() << "KPlayerDVBChannelProperties::setupInfo\n"; #endif KPlayerChannelProperties::setupInfo(); - QString id (url().fileName()); + TQString id (url().fileName()); setDefaultName (parent() -> channelName (id)); setDefaultFrequency (parent() -> channelFrequency (id)); } @@ -4064,28 +4064,28 @@ bool KPlayerDVBChannelProperties::canChangeFrequency (void) const return false; } -QString KPlayerDVBChannelProperties::deviceOption (void) const +TQString KPlayerDVBChannelProperties::deviceOption (void) const { return "-dvbin"; } -QString KPlayerDVBChannelProperties::deviceSetting (void) const +TQString KPlayerDVBChannelProperties::deviceSetting (void) const { - QString setting; - QRegExp re_card ("^kplayer:/devices/dev/dvb/adapter(\\d+)"); + TQString setting; + TQRegExp re_card ("^kplayer:/devices/dev/dvb/adapter(\\d+)"); if ( re_card.search (url().url()) >= 0 ) - setting = "card=" + QString::number (re_card.cap(1).toInt() + 1); + setting = "card=" + TQString::number (re_card.cap(1).toInt() + 1); if ( hasVideoInput() || parent() -> hasVideoInput() ) { if ( ! setting.isEmpty() ) setting += ":"; - setting += "vid=" + QString::number (videoInput()); + setting += "vid=" + TQString::number (videoInput()); } if ( hasAudioInput() || parent() -> hasAudioInput() ) { if ( ! setting.isEmpty() ) setting += ":"; - setting += "aid=" + QString::number (audioInput()); + setting += "aid=" + TQString::number (audioInput()); } if ( hasChannelList() || parent() -> hasChannelList() ) { @@ -4096,7 +4096,7 @@ QString KPlayerDVBChannelProperties::deviceSetting (void) const return setting; } -QString KPlayerDVBChannelProperties::urlString (void) const +TQString KPlayerDVBChannelProperties::urlString (void) const { return "dvb://" + defaultName(); } @@ -4128,7 +4128,7 @@ void KPlayerItemProperties::setupInfo (void) config() -> deleteEntry ("Video Size"); config() -> writeEntry ("Has Video", false); } - QString value (config() -> readEntry ("Full Screen")); + TQString value (config() -> readEntry ("Full Screen")); if ( value == "0" ) config() -> writeEntry ("Full Screen", false); else if ( value == "1" ) @@ -4171,7 +4171,7 @@ void KPlayerItemProperties::setupMeta (void) #endif if ( ! hasIcon() && m_meta_info_timer < 2000 ) { - QTime timer; + TQTime timer; timer.start(); KMimeType::Ptr mimetype (KMimeType::findByURL (url())); if ( mimetype != KMimeType::defaultMimeTypePtr() ) @@ -4180,13 +4180,13 @@ void KPlayerItemProperties::setupMeta (void) KFileMetaInfo info (url()); if ( info.isValid() ) { - QStringList keys (info.supportedKeys()); - for ( QStringList::ConstIterator iterator = keys.begin(); iterator != keys.end(); ++ iterator ) + TQStringList keys (info.supportedKeys()); + for ( TQStringList::ConstIterator iterator = keys.begin(); iterator != keys.end(); ++ iterator ) { - QString key (*iterator); + TQString key (*iterator); KFileMetaInfoItem item (info.item (key)); if ( item.isValid() && ! key.isEmpty() ) - if ( item.type() == QVariant::Size ) + if ( item.type() == TQVariant::Size ) { key = key.lower(); capitalizeWords (key); @@ -4200,7 +4200,7 @@ void KPlayerItemProperties::setupMeta (void) setSize (key, item.value().toSize()); } } - else if ( item.type() != QVariant::Bool ) + else if ( item.type() != TQVariant::Bool ) importMeta (key, item.value().toString()); } } @@ -4211,28 +4211,28 @@ void KPlayerItemProperties::setupMeta (void) KPlayerTrackProperties::setupMeta(); } -QString KPlayerItemProperties::urlString (void) const +TQString KPlayerItemProperties::urlString (void) const { return url().isLocalFile() ? url().path() : url().url(); } -bool KPlayerItemProperties::autoloadSubtitles (const QString& key) const +bool KPlayerItemProperties::autoloadSubtitles (const TQString& key) const { return url().isLocalFile() && (has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> autoloadSubtitles (key)); } -bool KPlayerItemProperties::getVobsubSubtitles (const QString& key, const KURL& url) const +bool KPlayerItemProperties::getVobsubSubtitles (const TQString& key, const KURL& url) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getVobsubSubtitles (key, url); } -bool KPlayerItemProperties::getPlaylist (const QString& key, const KURL& url) const +bool KPlayerItemProperties::getPlaylist (const TQString& key, const KURL& url) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getPlaylist (key, url); } -bool KPlayerItemProperties::getUseKioslave (const QString& key, const KURL& url) const +bool KPlayerItemProperties::getUseKioslave (const TQString& key, const KURL& url) const { return has (key) ? ((KPlayerBooleanProperty*) m_properties [key]) -> value() : parent() -> getUseKioslave (key, url); } |