summaryrefslogtreecommitdiffstats
path: root/kioslave/media
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kioslave/media
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/media')
-rw-r--r--kioslave/media/kcmodule/managermoduleview.ui10
-rw-r--r--kioslave/media/kcmodule/mimetypelistboxitem.h4
-rw-r--r--kioslave/media/kcmodule/notifiermodule.cpp4
-rw-r--r--kioslave/media/kcmodule/notifiermoduleview.ui14
-rw-r--r--kioslave/media/kcmodule/serviceconfigdialog.cpp2
-rw-r--r--kioslave/media/kcmodule/serviceview.ui22
-rw-r--r--kioslave/media/kfile-plugin/kfilemediaplugin.cpp6
-rw-r--r--kioslave/media/libmediacommon/actionlistboxitem.cpp2
-rw-r--r--kioslave/media/libmediacommon/actionlistboxitem.h4
-rw-r--r--kioslave/media/libmediacommon/medium.cpp2
-rw-r--r--kioslave/media/libmediacommon/medium.h4
-rw-r--r--kioslave/media/libmediacommon/notifieraction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifieropenaction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifierserviceaction.cpp4
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.cpp12
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.h2
-rw-r--r--kioslave/media/mediaimpl.cpp12
-rw-r--r--kioslave/media/mediamanager/fstabbackend.cpp80
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp42
-rw-r--r--kioslave/media/mediamanager/linuxcdpolling.cpp18
-rw-r--r--kioslave/media/mediamanager/medialist.cpp22
-rw-r--r--kioslave/media/mediamanager/removablebackend.cpp16
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp6
-rw-r--r--kioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--kioslave/media/medianotifier/notificationdialogview.ui16
-rw-r--r--kioslave/media/mounthelper/decryptdialog.ui32
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.cpp6
-rw-r--r--kioslave/media/propsdlgplugin/propertiespage.cpp50
-rw-r--r--kioslave/media/propsdlgplugin/propertiespagegui.ui2
29 files changed, 200 insertions, 200 deletions
diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui
index 598718389..d5d42a066 100644
--- a/kioslave/media/kcmodule/managermoduleview.ui
+++ b/kioslave/media/kcmodule/managermoduleview.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ManagerModuleView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ManagerModuleView</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_HalBackendEnabled</cstring>
</property>
@@ -27,7 +27,7 @@
<string>Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_CdPollingEnabled</cstring>
</property>
@@ -38,7 +38,7 @@
<string>Select this to enable the CD polling.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>kcfg_AutostartEnabled</cstring>
</property>
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>360</height>
diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.h b/kioslave/media/kcmodule/mimetypelistboxitem.h
index f61afba3d..e02f58b11 100644
--- a/kioslave/media/kcmodule/mimetypelistboxitem.h
+++ b/kioslave/media/kcmodule/mimetypelistboxitem.h
@@ -1,6 +1,6 @@
/* This file is part of the KDE Project
Copyright (c) 2005 Jean-Remy Falleri <jr.falleri@laposte.net>
- Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>
+ Copyright (c) 2005 K�vin Ottens <ervin ipsquad net>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
#include <tqlistbox.h>
#include <tqstring.h>
-class MimetypeListBoxItem : public QListBoxText
+class MimetypeListBoxItem : public TQListBoxText
{
public:
MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent);
diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp
index c7871c953..5c4e4c357 100644
--- a/kioslave/media/kcmodule/notifiermodule.cpp
+++ b/kioslave/media/kcmodule/notifiermodule.cpp
@@ -159,7 +159,7 @@ void NotifierModule::slotAdd()
if ( value == TQDialog::Accepted )
{
- m_settings.addAction( action );
+ m_settings.tqaddAction( action );
updateListBox();
emit changed( true );
}
@@ -212,7 +212,7 @@ void NotifierModule::slotToggleAuto()
int index = m_view->actionsList->index( action_item );
- if ( action->autoMimetypes().contains( m_mimetype ) )
+ if ( action->autoMimetypes().tqcontains( m_mimetype ) )
{
m_settings.resetAutoAction( m_mimetype );
}
diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui
index 87edc0f36..50f93bc40 100644
--- a/kioslave/media/kcmodule/notifiermoduleview.ui
+++ b/kioslave/media/kcmodule/notifiermoduleview.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>NotifierModuleView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>NotifierModuleView</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout4</cstring>
</property>
@@ -24,7 +24,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
@@ -32,7 +32,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>mediumType</cstring>
</property>
@@ -66,7 +66,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout3</cstring>
</property>
@@ -74,7 +74,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>layout1</cstring>
</property>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>101</height>
diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/kcmodule/serviceconfigdialog.cpp
index 61dd060f2..76b342f92 100644
--- a/kioslave/media/kcmodule/serviceconfigdialog.cpp
+++ b/kioslave/media/kcmodule/serviceconfigdialog.cpp
@@ -63,7 +63,7 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
{
TQListBox *list;
- if ( action_mimetypes.contains( *it ) )
+ if ( action_mimetypes.tqcontains( *it ) )
{
list = m_view->mimetypesSelector->selectedListBox();
}
diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui
index 938a9bf89..6ae357699 100644
--- a/kioslave/media/kcmodule/serviceview.ui
+++ b/kioslave/media/kcmodule/serviceview.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ServiceView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ServiceView</cstring>
</property>
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>640</width>
<height>480</height>
@@ -33,7 +33,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox" row="0" column="0">
+ <widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -52,7 +52,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout8</cstring>
</property>
@@ -60,7 +60,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout6</cstring>
</property>
@@ -80,13 +80,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>40</width>
<height>40</height>
@@ -99,7 +99,7 @@
<number>32</number>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
</property>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -194,7 +194,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
</property>
diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
index bda34bff2..580a678bc 100644
--- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
+++ b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
@@ -140,7 +140,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
group = appendGroup(info, "mediumSummary");
- appendItem(group, "percent", TQString("%1%").arg(percent));
+ appendItem(group, "percent", TQString("%1%").tqarg(percent));
TQPixmap bar(150, 20);
TQPainter p(&bar);
@@ -148,9 +148,9 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
p.fillRect(0, 0, length, 20, Qt::red);
p.fillRect(length, 0, 150-length, 20, Qt::green);
- TQColorGroup cg = TQApplication::palette().active();
+ TQColorGroup cg = TQApplication::tqpalette().active();
- TQApplication::style().drawPrimitive(TQStyle::PE_Panel, &p,
+ TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &p,
TQRect(0, 0, 150, 20), cg,
TQStyle::Style_Sunken);
diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/kioslave/media/libmediacommon/actionlistboxitem.cpp
index 271d2e487..42a724c75 100644
--- a/kioslave/media/libmediacommon/actionlistboxitem.cpp
+++ b/kioslave/media/libmediacommon/actionlistboxitem.cpp
@@ -29,7 +29,7 @@ ActionListBoxItem::ActionListBoxItem(NotifierAction *action, TQString mimetype,
{
TQString text = m_action->label();
- if ( m_action->autoMimetypes().contains( mimetype ) )
+ if ( m_action->autoMimetypes().tqcontains( mimetype ) )
{
text += " (" + i18n( "Auto Action" ) + ")";
}
diff --git a/kioslave/media/libmediacommon/actionlistboxitem.h b/kioslave/media/libmediacommon/actionlistboxitem.h
index 0378e1d6f..254f065de 100644
--- a/kioslave/media/libmediacommon/actionlistboxitem.h
+++ b/kioslave/media/libmediacommon/actionlistboxitem.h
@@ -1,6 +1,6 @@
/* This file is part of the KDE Project
Copyright (c) 2005 Jean-Remy Falleri <jr.falleri@laposte.net>
- Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>
+ Copyright (c) 2005 K�vin Ottens <ervin ipsquad net>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
#include "notifieraction.h"
-class ActionListBoxItem : public QListBoxPixmap
+class ActionListBoxItem : public TQListBoxPixmap
{
public:
ActionListBoxItem(NotifierAction *action, TQString mimetype, TQListBox *parent);
diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp
index e7e91dd54..2aa7359ad 100644
--- a/kioslave/media/libmediacommon/medium.cpp
+++ b/kioslave/media/libmediacommon/medium.cpp
@@ -109,7 +109,7 @@ Medium::List Medium::createList(const TQStringList &properties)
l.append(m);
TQStringList::iterator first = props.begin();
- TQStringList::iterator last = props.find(SEPARATOR);
+ TQStringList::iterator last = props.tqfind(SEPARATOR);
++last;
props.erase(first, last);
}
diff --git a/kioslave/media/libmediacommon/medium.h b/kioslave/media/libmediacommon/medium.h
index 54e1556dc..eeef12eb2 100644
--- a/kioslave/media/libmediacommon/medium.h
+++ b/kioslave/media/libmediacommon/medium.h
@@ -109,8 +109,8 @@ namespace MediaManagerUtils {
for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
{
- TQString key = (*it).left((*it).find('='));
- TQString value = (*it).mid((*it).find('=') + 1);
+ TQString key = (*it).left((*it).tqfind('='));
+ TQString value = (*it).mid((*it).tqfind('=') + 1);
valids[key] = value;
}
return valids;
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp
index d10314701..9a6572150 100644
--- a/kioslave/media/libmediacommon/notifieraction.cpp
+++ b/kioslave/media/libmediacommon/notifieraction.cpp
@@ -69,7 +69,7 @@ TQString NotifierAction::label() const
void NotifierAction::addAutoMimetype( const TQString &mimetype )
{
- if ( !m_autoMimetypes.contains( mimetype ) )
+ if ( !m_autoMimetypes.tqcontains( mimetype ) )
{
m_autoMimetypes.append( mimetype );
}
diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/kioslave/media/libmediacommon/notifieropenaction.cpp
index 4d6d8025c..01c8b010f 100644
--- a/kioslave/media/libmediacommon/notifieropenaction.cpp
+++ b/kioslave/media/libmediacommon/notifieropenaction.cpp
@@ -40,6 +40,6 @@ void NotifierOpenAction::execute(KFileItem &medium)
bool NotifierOpenAction::supportsMimetype( const TQString &mimetype ) const
{
- return !mimetype.contains( "blank" ) && !mimetype.contains( "encrypted" );
+ return !mimetype.tqcontains( "blank" ) && !mimetype.tqcontains( "encrypted" );
}
diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/kioslave/media/libmediacommon/notifierserviceaction.cpp
index c7bece4f8..8cf916848 100644
--- a/kioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/kioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -99,7 +99,7 @@ void NotifierServiceAction::updateFilePath()
if ( !m_filePath.isEmpty() ) return;
TQString action_name = m_service.m_strName;
- action_name.replace( " ", "_" );
+ action_name.tqreplace( " ", "_" );
TQDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) );
@@ -144,7 +144,7 @@ bool NotifierServiceAction::isWritable() const
bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const
{
- return m_mimetypes.contains(mimetype);
+ return m_mimetypes.tqcontains(mimetype);
}
void NotifierServiceAction::save() const
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp
index d1ab55d87..fd0aefc67 100644
--- a/kioslave/media/libmediacommon/notifiersettings.cpp
+++ b/kioslave/media/libmediacommon/notifiersettings.cpp
@@ -109,9 +109,9 @@ TQValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const TQStrin
return result;
}
-bool NotifierSettings::addAction( NotifierServiceAction *action )
+bool NotifierSettings::tqaddAction( NotifierServiceAction *action )
{
- if ( !m_idMap.contains( action->id() ) )
+ if ( !m_idMap.tqcontains( action->id() ) )
{
m_actions.insert( --m_actions.end(), action );
m_idMap[ action->id() ] = action;
@@ -153,7 +153,7 @@ void NotifierSettings::setAutoAction( const TQString &mimetype, NotifierAction *
void NotifierSettings::resetAutoAction( const TQString &mimetype )
{
- if ( m_autoMimetypesMap.contains( mimetype ) )
+ if ( m_autoMimetypesMap.tqcontains( mimetype ) )
{
NotifierAction *action = m_autoMimetypesMap[mimetype];
action->removeAutoMimetype( mimetype );
@@ -179,7 +179,7 @@ void NotifierSettings::clearAutoActions()
NotifierAction *NotifierSettings::autoActionForMimetype( const TQString &mimetype )
{
- if ( m_autoMimetypesMap.contains( mimetype ) )
+ if ( m_autoMimetypesMap.tqcontains( mimetype ) )
{
return m_autoMimetypesMap[mimetype];
}
@@ -238,7 +238,7 @@ void NotifierSettings::reload()
TQString mime = auto_it.key();
TQString action_id = auto_it.data();
- if ( m_idMap.contains( action_id ) )
+ if ( m_idMap.tqcontains( action_id ) )
{
setAutoAction( mime, m_idMap[action_id] );
}
@@ -349,7 +349,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString
}
}
}
- else if ( types.contains(mimetype) )
+ else if ( types.tqcontains(mimetype) )
{
return true;
}
diff --git a/kioslave/media/libmediacommon/notifiersettings.h b/kioslave/media/libmediacommon/notifiersettings.h
index dee5c440b..a1f46f961 100644
--- a/kioslave/media/libmediacommon/notifiersettings.h
+++ b/kioslave/media/libmediacommon/notifiersettings.h
@@ -36,7 +36,7 @@ public:
TQValueList<NotifierAction*> actions();
TQValueList<NotifierAction*> actionsForMimetype( const TQString &mimetype );
- bool addAction( NotifierServiceAction *action );
+ bool tqaddAction( NotifierServiceAction *action );
bool deleteAction( NotifierServiceAction *action );
void setAutoAction( const TQString &mimetype, NotifierAction *action );
diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp
index b55b37e5d..c097fcca4 100644
--- a/kioslave/media/mediaimpl.cpp
+++ b/kioslave/media/mediaimpl.cpp
@@ -43,7 +43,7 @@ bool MediaImpl::parseURL(const KURL &url, TQString &name, TQString &path) const
{
TQString url_path = url.path();
- int i = url_path.find('/', 1);
+ int i = url_path.tqfind('/', 1);
if (i > 0)
{
name = url_path.mid(1, i-1);
@@ -267,7 +267,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
if (!m_lastErrorMessage.isEmpty())
m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
else {
- qApp->eventLoop()->enterLoop();
+ tqApp->eventLoop()->enterLoop();
}
mp_mounting = 0L;
@@ -304,7 +304,7 @@ void MediaImpl::slotMountResult(KIO::Job *job)
{
m_lastErrorCode = job->error();
m_lastErrorMessage = job->errorText();
- qApp->eventLoop()->exitLoop();
+ tqApp->eventLoop()->exitLoop();
}
}
@@ -317,7 +317,7 @@ void MediaImpl::slotMediumChanged(const TQString &name)
kdDebug(1219) << "MediaImpl::slotMediumChanged: updating mp_mounting" << endl;
bool ok;
*mp_mounting = findMediumByName(name, ok);
- qApp->eventLoop()->exitLoop();
+ tqApp->eventLoop()->exitLoop();
}
}
@@ -351,7 +351,7 @@ void MediaImpl::slotStatResult(KIO::Job *job)
m_entryBuffer = stat_job->statResult();
}
- qApp->eventLoop()->exitLoop();
+ tqApp->eventLoop()->exitLoop();
}
KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
@@ -364,7 +364,7 @@ KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
this, TQT_SLOT( slotStatResult(KIO::Job *) ) );
connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ),
this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) );
- qApp->eventLoop()->enterLoop();
+ tqApp->eventLoop()->enterLoop();
KIO::UDSEntry::iterator it = m_entryBuffer.begin();
KIO::UDSEntry::iterator end = m_entryBuffer.end();
diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/kioslave/media/mediamanager/fstabbackend.cpp
index 189f52aee..71dbdb1f0 100644
--- a/kioslave/media/mediamanager/fstabbackend.cpp
+++ b/kioslave/media/mediamanager/fstabbackend.cpp
@@ -137,24 +137,24 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly)
|| mount->mountType() == "fdescfs"
|| mount->mountType() == "kernfs"
|| mount->mountType() == "usbfs"
- || mount->mountType().contains( "proc" )
+ || mount->mountType().tqcontains( "proc" )
|| mount->mountType() == "unknown"
|| mount->mountType() == "none"
|| mount->mountType() == "sunrpc"
|| mount->mountedFrom() == "none"
|| mount->mountedFrom() == "tmpfs"
- || mount->mountedFrom().find("shm") != -1
+ || mount->mountedFrom().tqfind("shm") != -1
|| mount->mountPoint() == "/dev/swap"
|| mount->mountPoint() == "/dev/pts"
- || mount->mountPoint().find("/proc") == 0
- || mount->mountPoint().find("/sys") == 0
+ || mount->mountPoint().tqfind("/proc") == 0
+ || mount->mountPoint().tqfind("/sys") == 0
// We might want to display only network shares
// since HAL doesn't handle them
|| ( networkSharesOnly
- && mount->mountType().find( "smb" ) == -1
- && mount->mountType().find( "cifs" ) == -1
- && mount->mountType().find( "nfs" ) == -1
+ && mount->mountType().tqfind( "smb" ) == -1
+ && mount->mountType().tqfind( "cifs" ) == -1
+ && mount->mountType().tqfind( "nfs" ) == -1
)
)
{
@@ -187,7 +187,7 @@ void FstabBackend::handleMtabChange(bool allowNotification)
nothing has changed, do not stat the mount point. Avoids
hang if network shares are stalling */
TQString mtabEntry = dev + "*" + mp + "*" + fs;
- if(m_mtabEntries.contains(mtabEntry)) {
+ if(m_mtabEntries.tqcontains(mtabEntry)) {
new_mtabIds += m_mtabEntries[mtabEntry];
continue;
}
@@ -196,7 +196,7 @@ void FstabBackend::handleMtabChange(bool allowNotification)
new_mtabIds+=id;
m_mtabEntries[mtabEntry] = id;
- if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) )
+ if ( !m_mtabIds.tqcontains(id) && m_fstabIds.tqcontains(id) )
{
TQString mime, icon, label;
guess(dev, mp, fs, true, mime, icon, label);
@@ -204,7 +204,7 @@ void FstabBackend::handleMtabChange(bool allowNotification)
mime, icon, label);
}
#if 0
- else if ( !m_mtabIds.contains(id) )
+ else if ( !m_mtabIds.tqcontains(id) )
{
TQString name = generateName(dev, fs);
@@ -229,7 +229,7 @@ void FstabBackend::handleMtabChange(bool allowNotification)
for (; it2!=end2; ++it2)
{
- if ( !new_mtabIds.contains(*it2) && m_fstabIds.contains(*it2) )
+ if ( !new_mtabIds.tqcontains(*it2) && m_fstabIds.tqcontains(*it2) )
{
const Medium *medium = m_mediaList.findById(*it2);
@@ -248,7 +248,7 @@ void FstabBackend::handleMtabChange(bool allowNotification)
mime, icon, label);
}
#if 0
- else if ( !new_mtabIds.contains(*it2) )
+ else if ( !new_mtabIds.tqcontains(*it2) )
{
m_mediaList.removeMedium(*it2, allowNotification);
}
@@ -277,7 +277,7 @@ void FstabBackend::handleFstabChange(bool allowNotification)
TQString id = generateId(dev, mp);
new_fstabIds+=id;
- if ( !m_fstabIds.contains(id) )
+ if ( !m_fstabIds.tqcontains(id) )
{
TQString name = generateName(dev, fs);
@@ -301,7 +301,7 @@ void FstabBackend::handleFstabChange(bool allowNotification)
for (; it2!=end2; ++it2)
{
- if ( !new_fstabIds.contains(*it2) )
+ if ( !new_fstabIds.tqcontains(*it2) )
{
m_mediaList.removeMedium(*it2, allowNotification);
}
@@ -317,8 +317,8 @@ TQString FstabBackend::generateId(const TQString &devNode,
TQString m = KStandardDirs::realPath(mountPoint);
return "/org/kde/mediamanager/fstab/"
- +d.replace("/", "")
- +m.replace("/", "");
+ +d.tqreplace("/", "")
+ +m.tqreplace("/", "");
}
TQString FstabBackend::generateName(const TQString &devNode, const TQString &fsType)
@@ -363,7 +363,7 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint,
{
TQString buf;
m.readLine(buf, 1024);
- if(buf.contains("cdrom"))
+ if(buf.tqcontains("cdrom"))
isCd=true;
m.close();
}
@@ -387,37 +387,37 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint,
}
#endif
if ( devType == CDWRITER
- || devNode.find("cdwriter")!=-1 || mountPoint.find("cdwriter")!=-1
- || devNode.find("cdrecorder")!=-1 || mountPoint.find("cdrecorder")!=-1
- || devNode.find("cdburner")!=-1 || mountPoint.find("cdburner")!=-1
- || devNode.find("cdrw")!=-1 || mountPoint.find("cdrw")!=-1
- || devNode.find("graveur")!=-1
+ || devNode.tqfind("cdwriter")!=-1 || mountPoint.tqfind("cdwriter")!=-1
+ || devNode.tqfind("cdrecorder")!=-1 || mountPoint.tqfind("cdrecorder")!=-1
+ || devNode.tqfind("cdburner")!=-1 || mountPoint.tqfind("cdburner")!=-1
+ || devNode.tqfind("cdrw")!=-1 || mountPoint.tqfind("cdrw")!=-1
+ || devNode.tqfind("graveur")!=-1
)
{
mimeType = "media/cdwriter";
label = i18n("CD Recorder");
}
else if ( devType == DVD || devType == DVDWRITER
- || devNode.find("dvd")!=-1 || mountPoint.find("dvd")!=-1 )
+ || devNode.tqfind("dvd")!=-1 || mountPoint.tqfind("dvd")!=-1 )
{
mimeType = "media/dvd";
label = i18n("DVD");
}
else if ( devType == CD
- || devNode.find("cdrom")!=-1 || mountPoint.find("cdrom")!=-1
+ || devNode.tqfind("cdrom")!=-1 || mountPoint.tqfind("cdrom")!=-1
// LINUX SPECIFIC
- || devNode.find("/dev/scd")!=-1 || devNode.find("/dev/sr")!=-1
+ || devNode.tqfind("/dev/scd")!=-1 || devNode.tqfind("/dev/sr")!=-1
// FREEBSD SPECIFIC
- || devNode.find("/acd")!=-1 || devNode.find("/scd")!=-1
+ || devNode.tqfind("/acd")!=-1 || devNode.tqfind("/scd")!=-1
)
{
mimeType = "media/cdrom";
label = i18n("CD-ROM");
}
- else if ( devNode.find("fd")!=-1 || mountPoint.find("fd")!=-1
- || devNode.find("floppy")!=-1 || mountPoint.find("floppy")!=-1 )
+ else if ( devNode.tqfind("fd")!=-1 || mountPoint.tqfind("fd")!=-1
+ || devNode.tqfind("floppy")!=-1 || mountPoint.tqfind("floppy")!=-1 )
{
- if ( devNode.find("360")!=-1 || devNode.find("1200")!=-1 )
+ if ( devNode.tqfind("360")!=-1 || devNode.tqfind("1200")!=-1 )
{
mimeType = "media/floppy5";
}
@@ -427,32 +427,32 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint,
}
label = i18n("Floppy");
}
- else if ( mountPoint.find("zip")!=-1
+ else if ( mountPoint.tqfind("zip")!=-1
// FREEBSD SPECIFIC
- || devNode.find("/afd")!=-1
+ || devNode.tqfind("/afd")!=-1
)
{
mimeType = "media/zip";
label = i18n("Zip Disk");
}
- else if ( mountPoint.find("removable")!=-1
- || mountPoint.find("hotplug")!=-1
- || mountPoint.find("usb")!=-1
- || mountPoint.find("firewire")!=-1
- || mountPoint.find("ieee1394")!=-1
- || devNode.find("/usb/")!= -1
+ else if ( mountPoint.tqfind("removable")!=-1
+ || mountPoint.tqfind("hotplug")!=-1
+ || mountPoint.tqfind("usb")!=-1
+ || mountPoint.tqfind("firewire")!=-1
+ || mountPoint.tqfind("ieee1394")!=-1
+ || devNode.tqfind("/usb/")!= -1
)
{
mimeType = "media/removable";
label = i18n("Removable Device");
}
- else if ( fsType.find("nfs")!=-1 )
+ else if ( fsType.tqfind("nfs")!=-1 )
{
mimeType = "media/nfs";
label = i18n("Remote Share");
}
- else if ( fsType.find("smb")!=-1 || fsType.find("cifs")!=-1
- || devNode.find("//")!=-1 )
+ else if ( fsType.tqfind("smb")!=-1 || fsType.tqfind("cifs")!=-1
+ || devNode.tqfind("//")!=-1 )
{
mimeType = "media/smb";
label = i18n("Remote Share");
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 7b56d46ad..d44826590 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi)
void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification)
{
kdDebug(1219) << "HALBackend::setProperties" << endl;
- if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
+ if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
{
const Medium *cmedium = m_mediaList.findById(mediumUdi);
if ( cmedium )
@@ -942,7 +942,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << TQString("automount=%1").arg(value ? "true" : "false");
- if (valids.contains("ro"))
+ if (valids.tqcontains("ro"))
{
value = config.readBoolEntry("ro", false);
tmp = TQString("ro=%1").arg(value ? "true" : "false");
@@ -950,7 +950,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << tmp;
}
- if (valids.contains("quiet"))
+ if (valids.tqcontains("quiet"))
{
value = config.readBoolEntry("quiet", false);
tmp = TQString("quiet=%1").arg(value ? "true" : "false");
@@ -958,28 +958,28 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << tmp;
}
- if (valids.contains("flush"))
+ if (valids.tqcontains("flush"))
{
value = config.readBoolEntry("flush", fstype.endsWith("fat"));
tmp = TQString("flush=%1").arg(value ? "true" : "false");
result << tmp;
}
- if (valids.contains("uid"))
+ if (valids.tqcontains("uid"))
{
value = config.readBoolEntry("uid", true);
tmp = TQString("uid=%1").arg(value ? "true" : "false");
result << tmp;
}
- if (valids.contains("utf8"))
+ if (valids.tqcontains("utf8"))
{
value = config.readBoolEntry("utf8", true);
tmp = TQString("utf8=%1").arg(value ? "true" : "false");
result << tmp;
}
- if (valids.contains("shortname"))
+ if (valids.tqcontains("shortname"))
{
TQString svalue = config.readEntry("shortname", "lower").lower();
if (svalue == "winnt")
@@ -993,7 +993,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
}
// pass our locale to the ntfs-3g driver so it can translate local characters
- if (valids.contains("locale") && fstype == "ntfs-3g")
+ if (valids.tqcontains("locale") && fstype == "ntfs-3g")
{
// have to obtain LC_CTYPE as returned by the `locale` command
// check in the same order as `locale` does
@@ -1003,15 +1003,15 @@ TQStringList HALBackend::mountoptions(const TQString &name)
}
}
- if (valids.contains("sync"))
+ if (valids.tqcontains("sync"))
{
- value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
+ value = config.readBoolEntry("sync", ( valids.tqcontains("flush") && !fstype.endsWith("fat") ) && removable);
tmp = TQString("sync=%1").arg(value ? "true" : "false");
if (fstype != "iso9660") // makes no sense
result << tmp;
}
- if (valids.contains("noatime"))
+ if (valids.tqcontains("noatime"))
{
value = config.readBoolEntry("atime", !fstype.endsWith("fat"));
tmp = TQString("atime=%1").arg(value ? "true" : "false");
@@ -1031,7 +1031,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
result << TQString("mountpoint=%1").arg(mount_point);
result << TQString("filesystem=%1").arg(fstype);
- if (valids.contains("data"))
+ if (valids.tqcontains("data"))
{
TQString svalue = config.readEntry("journaling").lower();
if (svalue == "ordered")
@@ -1058,19 +1058,19 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
for (int index = 0; names[index]; ++index)
- if (valids.contains(names[index]))
+ if (valids.tqcontains(names[index]))
config.writeEntry(names[index], valids[names[index]] == "true");
- if (valids.contains("shortname"))
+ if (valids.tqcontains("shortname"))
config.writeEntry("shortname", valids["shortname"]);
- if (valids.contains("journaling"))
+ if (valids.tqcontains("journaling"))
config.writeEntry("journaling", valids["journaling"]);
- if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"])))
+ if (!mountoptions(name).tqcontains(TQString("mountpoint=%1").arg(valids["mountpoint"])))
config.writeEntry("mountpoint", valids["mountpoint"]);
- if (valids.contains("automount")) {
+ if (valids.tqcontains("automount")) {
TQString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
config.setGroup(drive_udi);
config.writeEntry("automount", valids["automount"]);
@@ -1376,7 +1376,7 @@ TQString HALBackend::isInFstab(const Medium *medium)
if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) )
{
TQStringList opts = (*it)->mountOptions();
- if (opts.contains("user") || opts.contains("users"))
+ if (opts.tqcontains("user") || opts.tqcontains("users"))
return (*it)->mountPoint();
}
}
@@ -1451,17 +1451,17 @@ TQString HALBackend::mount(const Medium *medium)
if (mount_point.startsWith("/media/"))
mount_point = mount_point.mid(7);
- if (valids.contains("shortname"))
+ if (valids.tqcontains("shortname"))
{
soptions << TQString("shortname=%1").arg(valids["shortname"]);
}
- if (valids.contains("locale"))
+ if (valids.tqcontains("locale"))
{
soptions << TQString("locale=%1").arg(valids["locale"]);
}
- if (valids.contains("journaling"))
+ if (valids.tqcontains("journaling"))
{
TQString option = valids["journaling"];
if (option == "data")
diff --git a/kioslave/media/mediamanager/linuxcdpolling.cpp b/kioslave/media/mediamanager/linuxcdpolling.cpp
index 945fd950a..5a1359b6d 100644
--- a/kioslave/media/mediamanager/linuxcdpolling.cpp
+++ b/kioslave/media/mediamanager/linuxcdpolling.cpp
@@ -110,7 +110,7 @@ DiscType::operator int() const
}
-class PollingThread : public QThread
+class PollingThread : public TQThread
{
public:
PollingThread(const TQCString &devNode) : m_dev(devNode)
@@ -209,14 +209,14 @@ void LinuxCDPolling::slotMediumAdded(const TQString &id)
{
kdDebug(1219) << "LinuxCDPolling::slotMediumAdded(" << id << ")" << endl;
- if (m_threads.contains(id)) return;
+ if (m_threads.tqcontains(id)) return;
const Medium *medium = m_mediaList.findById(id);
TQString mime = medium->mimeType();
kdDebug(1219) << "mime == " << mime << endl;
- if (mime.find("dvd")==-1 && mime.find("cd")==-1) return;
+ if (mime.tqfind("dvd")==-1 && mime.tqfind("cd")==-1) return;
if (!medium->isMounted())
{
@@ -234,7 +234,7 @@ void LinuxCDPolling::slotMediumRemoved(const TQString &id)
{
kdDebug(1219) << "LinuxCDPolling::slotMediumRemoved(" << id << ")" << endl;
- if (!m_threads.contains(id)) return;
+ if (!m_threads.tqcontains(id)) return;
PollingThread *thread = m_threads[id];
m_threads.remove(id);
@@ -255,9 +255,9 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id)
TQString mime = medium->mimeType();
kdDebug(1219) << "mime == " << mime << endl;
- if (mime.find("dvd")==-1 && mime.find("cd")==-1) return;
+ if (mime.tqfind("dvd")==-1 && mime.tqfind("cd")==-1) return;
- if (!m_threads.contains(id) && !medium->isMounted())
+ if (!m_threads.tqcontains(id) && !medium->isMounted())
{
// It is just a mount state change, no need to notify
m_excludeNotification.append( id );
@@ -268,7 +268,7 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id)
thread->start();
m_timer.start(500);
}
- else if (m_threads.contains(id) && medium->isMounted())
+ else if (m_threads.tqcontains(id) && medium->isMounted())
{
PollingThread *thread = m_threads[id];
m_threads.remove(id);
@@ -319,7 +319,7 @@ static TQString baseType(const Medium *medium)
FstabBackend::guess(devNode, mountPoint, fsType, mounted,
mimeType, iconName, label);
- if (devNode.find("dvd")!=-1)
+ if (devNode.tqfind("dvd")!=-1)
{
kdDebug(1219) << "=> dvd" << endl;
return "dvd";
@@ -360,7 +360,7 @@ void LinuxCDPolling::applyType(DiscType type, const Medium *medium)
TQString id = medium->id();
TQString dev = medium->deviceNode();
- bool notify = !m_excludeNotification.contains(id);
+ bool notify = !m_excludeNotification.tqcontains(id);
m_excludeNotification.remove(id);
switch (type)
diff --git a/kioslave/media/mediamanager/medialist.cpp b/kioslave/media/mediamanager/medialist.cpp
index bb0de6248..2e766bb07 100644
--- a/kioslave/media/mediamanager/medialist.cpp
+++ b/kioslave/media/mediamanager/medialist.cpp
@@ -38,7 +38,7 @@ const Medium *MediaList::findById(const TQString &id) const
{
kdDebug(1219) << "MediaList::findById(" << id << ")" << endl;
- if ( !m_idMap.contains(id) ) return 0L;
+ if ( !m_idMap.tqcontains(id) ) return 0L;
return m_idMap[id];
}
@@ -47,7 +47,7 @@ const Medium *MediaList::findByName(const TQString &name) const
{
kdDebug(1219) << "MediaList::findByName(" << name << ")" << endl;
- if ( !m_nameMap.contains(name) ) return 0L;
+ if ( !m_nameMap.tqcontains(name) ) return 0L;
return m_nameMap[name];
}
@@ -70,13 +70,13 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification)
kdDebug(1219) << "MediaList::addMedium(@" << medium->id() << ")" << endl;
TQString id = medium->id();
- if ( m_idMap.contains(id) ) return TQString::null;
+ if ( m_idMap.tqcontains(id) ) return TQString::null;
m_media.append( medium );
m_idMap[id] = medium;
TQString name = medium->name();
- if ( !m_nameMap.contains(name) )
+ if ( !m_nameMap.tqcontains(name) )
{
m_nameMap[name] = medium;
@@ -90,7 +90,7 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification)
TQString base_name = name+"_";
int i = 1;
- while ( m_nameMap.contains(base_name+TQString::number(i)) )
+ while ( m_nameMap.tqcontains(base_name+TQString::number(i)) )
{
i++;
}
@@ -109,7 +109,7 @@ bool MediaList::removeMedium(const TQString &id, bool allowNotification)
{
kdDebug(1219) << "MediaList::removeMedium(" << id << ")" << endl;
- if ( !m_idMap.contains(id) ) return false;
+ if ( !m_idMap.tqcontains(id) ) return false;
Medium *medium = m_idMap[id];
TQString name = medium->name();
@@ -126,7 +126,7 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
{
kdDebug(1219) << "MediaList::changeMediumState(const Medium &)" << endl;
- if ( !m_idMap.contains(medium.id()) ) return false;
+ if ( !m_idMap.tqcontains(medium.id()) ) return false;
Medium *m = m_idMap[medium.id()];
@@ -177,7 +177,7 @@ bool MediaList::changeMediumState(const TQString &id,
<< baseURL << ", " << mimeType << ", " << iconName << ")"
<< endl;
- if ( !m_idMap.contains(id) ) return false;
+ if ( !m_idMap.tqcontains(id) ) return false;
Medium *medium = m_idMap[id];
@@ -218,7 +218,7 @@ bool MediaList::changeMediumState(const TQString &id,
<< mounted << ", " << mimeType << ", " << iconName << ")"
<< endl;
- if ( !m_idMap.contains(id) ) return false;
+ if ( !m_idMap.tqcontains(id) ) return false;
Medium *medium = m_idMap[id];
@@ -255,7 +255,7 @@ bool MediaList::changeMediumState(const TQString &id, bool mounted,
<< mounted << ", " << mimeType << ", " << iconName << ")"
<< endl;
- if ( !m_idMap.contains(id) ) return false;
+ if ( !m_idMap.tqcontains(id) ) return false;
Medium *medium = m_idMap[id];
@@ -287,7 +287,7 @@ bool MediaList::setUserLabel(const TQString &name, const TQString &label)
kdDebug(1219) << "MediaList::setUserLabel(" << name << ", "
<< label << ")" << endl;
- if ( !m_nameMap.contains(name) ) return false;
+ if ( !m_nameMap.tqcontains(name) ) return false;
Medium *medium = m_nameMap[name];
medium->setUserLabel(label);
diff --git a/kioslave/media/mediamanager/removablebackend.cpp b/kioslave/media/mediamanager/removablebackend.cpp
index f307ee2f8..7db497c38 100644
--- a/kioslave/media/mediamanager/removablebackend.cpp
+++ b/kioslave/media/mediamanager/removablebackend.cpp
@@ -60,7 +60,7 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label)
TQString name = generateName(devNode);
TQString id = generateId(devNode);
- if (!m_removableIds.contains(id))
+ if (!m_removableIds.tqcontains(id))
{
Medium *medium = new Medium(id, name);
medium->mountableState(devNode, TQString::null,
@@ -95,7 +95,7 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label)
bool RemovableBackend::unplug(const TQString &devNode)
{
TQString id = generateId(devNode);
- if (m_removableIds.contains(id))
+ if (m_removableIds.tqcontains(id))
{
m_removableIds.remove(id);
return m_mediaList.removeMedium(id);
@@ -106,7 +106,7 @@ bool RemovableBackend::unplug(const TQString &devNode)
bool RemovableBackend::camera(const TQString &devNode)
{
TQString id = generateId(devNode);
- if (m_removableIds.contains(id))
+ if (m_removableIds.tqcontains(id))
{
return m_mediaList.changeMediumState(id,
TQString("camera:/"), false, "media/gphoto2camera");
@@ -140,8 +140,8 @@ void RemovableBackend::handleMtabChange()
TQString id = generateId(dev);
new_mtabIds+=id;
- if ( !m_mtabIds.contains(id)
- && m_removableIds.contains(id) )
+ if ( !m_mtabIds.tqcontains(id)
+ && m_removableIds.tqcontains(id) )
{
m_mediaList.changeMediumState(id, dev, mp, fs, true,
false, "media/removable_mounted");
@@ -153,8 +153,8 @@ void RemovableBackend::handleMtabChange()
for (; it2!=end2; ++it2)
{
- if ( !new_mtabIds.contains(*it2)
- && m_removableIds.contains(*it2) )
+ if ( !new_mtabIds.tqcontains(*it2)
+ && m_removableIds.tqcontains(*it2) )
{
m_mediaList.changeMediumState(*it2, false,
false, "media/removable_unmounted");
@@ -169,7 +169,7 @@ TQString RemovableBackend::generateId(const TQString &devNode)
TQString dev = KStandardDirs::realFilePath(devNode);
return "/org/kde/mediamanager/removable/"
- +dev.replace("/", "");
+ +dev.tqreplace("/", "");
}
TQString RemovableBackend::generateName(const TQString &devNode)
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index b0596e31d..ad9d00db8 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -113,7 +113,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
TQString mimetype = medium.mimetype();
bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" );
- bool is_mounted = mimetype.contains( "_mounted" );
+ bool is_mounted = mimetype.tqcontains( "_mounted" );
// We autorun only on CD/DVD or removable disks (USB, Firewire)
if ( !( is_cdrom || is_mounted )
@@ -222,7 +222,7 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const TQString &path,
// The relative path MUST NOT contain path components that
// refer to a parent directory ( ../ )
- if ( relative_path.startsWith( "/" ) || relative_path.contains( "../" ) )
+ if ( relative_path.startsWith( "/" ) || relative_path.tqcontains( "../" ) )
{
return false;
}
@@ -369,7 +369,7 @@ void MediaNotifier::slotFreeCancel()
void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
{
- TQCheckBox *checkbox = ::qt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
+ TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
if ( checkbox && checkbox->isChecked() )
KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
m_freeDialog->delayedDestruct();
diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp
index 7ba172601..9913f033d 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/kioslave/media/medianotifier/notificationdialog.cpp
@@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
updateActionsListBox();
- resize( TQSize(400,400).expandedTo( minimumSizeHint() ) );
+ resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) );
m_actionWatcher = new KDirWatch();
diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui
index f37a007b2..032ea1f10 100644
--- a/kioslave/media/medianotifier/notificationdialogview.ui
+++ b/kioslave/media/medianotifier/notificationdialogview.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>NotificationDialogView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>NotificationDialogView</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="spacing">
<number>15</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="spacing">
<number>20</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>iconLabel</cstring>
</property>
@@ -42,13 +42,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>64</width>
<height>64</height>
@@ -61,7 +61,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -74,7 +74,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>mimetypeLabel</cstring>
</property>
@@ -95,7 +95,7 @@
<cstring>actionsList</cstring>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>autoActionCheck</cstring>
</property>
diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui
index 15790c8ef..dfb8c17d0 100644
--- a/kioslave/media/mounthelper/decryptdialog.ui
+++ b/kioslave/media/mounthelper/decryptdialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DecryptDialog</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>DecryptDialog</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout5</cstring>
</property>
@@ -35,7 +35,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout4</cstring>
</property>
@@ -43,7 +43,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>encryptedIcon</cstring>
</property>
@@ -55,13 +55,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -70,7 +70,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>41</height>
@@ -93,7 +93,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>descLabel</cstring>
</property>
@@ -109,13 +109,13 @@
<string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted storage device.&lt;/p&gt;
&lt;p&gt;Please enter the password to decrypt the storage device.&lt;/p&gt;</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="0">
+ <widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout4</cstring>
</property>
@@ -123,7 +123,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -134,7 +134,7 @@
<cstring>passwordEdit</cstring>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>passwordEdit</cstring>
</property>
@@ -155,7 +155,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox" row="2" column="0">
+ <widget class="TQGroupBox" row="2" column="0">
<property name="name">
<cstring>errorBox</cstring>
</property>
@@ -174,7 +174,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>errorLabel</cstring>
</property>
@@ -189,7 +189,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 01448f79d..83d57df85 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -88,8 +88,8 @@ MountHelper::MountHelper() : KApplication()
TQString device = medium.deviceNode();
TQString mount_point = medium.mountPoint();
- m_isCdrom = medium.mimeType().find("dvd")!=-1
- || medium.mimeType().find("cd")!=-1;
+ m_isCdrom = medium.mimeType().tqfind("dvd")!=-1
+ || medium.mimeType().tqfind("cd")!=-1;
if (args->isSet("d"))
{
@@ -182,7 +182,7 @@ MountHelper::MountHelper() : KApplication()
void MountHelper::invokeEject(const TQString &device, bool quiet)
{
- KProcess *proc = new KProcess(this);
+ KProcess *proc = new KProcess(TQT_TQOBJECT(this));
*proc << "kdeeject";
if (quiet)
{
diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/kioslave/media/propsdlgplugin/propertiespage.cpp
index 14ac2b33f..209f350a8 100644
--- a/kioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/kioslave/media/propsdlgplugin/propertiespage.cpp
@@ -54,55 +54,55 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
- TQString key = (*it).left((*it).find('='));
- TQString value = (*it).mid((*it).find('=') + 1);
+ TQString key = (*it).left((*it).tqfind('='));
+ TQString value = (*it).mid((*it).tqfind('=') + 1);
kdDebug() << "key '" << key << "' value '" << value << "'\n";
options[key] = value;
}
- if (!options.contains("ro"))
+ if (!options.tqcontains("ro"))
option_ro->hide();
else
option_ro->setChecked(options["ro"] == "true");
connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("quiet"))
+ if (!options.tqcontains("quiet"))
option_quiet->hide();
else
option_quiet->setChecked(options["quiet"] == "true");
connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("sync"))
+ if (!options.tqcontains("sync"))
option_sync->hide();
else
option_sync->setChecked(options["sync"] == "true");
connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("atime"))
+ if (!options.tqcontains("atime"))
option_atime->hide();
else
option_atime->setChecked(options["atime"] == "true");
connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("flush"))
+ if (!options.tqcontains("flush"))
option_flush->hide();
else
option_flush->setChecked(options["flush"] == "true");
connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("utf8"))
+ if (!options.tqcontains("utf8"))
option_utf8->hide();
else
option_utf8->setChecked(options["utf8"] == "true");
connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("uid"))
+ if (!options.tqcontains("uid"))
option_uid->hide();
else
option_uid->setChecked(options["uid"] == "true");
connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("shortname"))
+ if (!options.tqcontains("shortname"))
{
option_shortname->hide();
text_shortname->hide();
@@ -118,7 +118,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
}
- if (!options.contains("journaling"))
+ if (!options.tqcontains("journaling"))
{
text_journaling->hide();
option_journaling->hide();
@@ -140,11 +140,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
option_automount->setChecked(options["automount"] == "true");
connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
- if (!options.contains("journaling") &&
- !options.contains("shortname") &&
- !options.contains("uid") &&
- !options.contains("utf8") &&
- !options.contains("flush"))
+ if (!options.tqcontains("journaling") &&
+ !options.tqcontains("shortname") &&
+ !options.tqcontains("uid") &&
+ !options.tqcontains("utf8") &&
+ !options.tqcontains("flush"))
groupbox_specific->hide();
} else {
@@ -163,31 +163,31 @@ bool PropertiesPage::save()
{
TQStringList result;
- if (options.contains("ro"))
+ if (options.tqcontains("ro"))
result << TQString("ro=%1").arg(option_ro->isChecked() ? "true" : "false");
- if (options.contains("quiet"))
+ if (options.tqcontains("quiet"))
result << TQString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false");
- if (options.contains("sync"))
+ if (options.tqcontains("sync"))
result << TQString("sync=%1").arg(option_sync->isChecked() ? "true" : "false");
- if (options.contains("atime"))
+ if (options.tqcontains("atime"))
result << TQString("atime=%1").arg(option_atime->isChecked() ? "true" : "false");
- if (options.contains("flush"))
+ if (options.tqcontains("flush"))
result << TQString("flush=%1").arg(option_flush->isChecked() ? "true" : "false");
- if (options.contains("utf8"))
+ if (options.tqcontains("utf8"))
result << TQString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false");
- if (options.contains("uid"))
+ if (options.tqcontains("uid"))
result << TQString("uid=%1").arg(option_uid->isChecked() ? "true" : "false");
- if (options.contains("shortname"))
+ if (options.tqcontains("shortname"))
result << TQString("shortname=%1").arg(short_names[option_shortname->currentItem()]);
- if (options.contains("journaling"))
+ if (options.tqcontains("journaling"))
result << TQString("journaling=%1").arg(journales[option_journaling->currentItem()]);
TQString mp = option_mountpoint->text();
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui
index c4de4c059..416c85c13 100644
--- a/kioslave/media/propsdlgplugin/propertiespagegui.ui
+++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui
@@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>