summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/arts/arts.cpp6
-rw-r--r--kcontrol/background/bgsettings.cpp6
-rw-r--r--kcontrol/bell/bell.cpp2
-rw-r--r--kcontrol/colors/colorscm.cpp10
-rw-r--r--kcontrol/componentchooser/componentchooser.cpp16
-rw-r--r--kcontrol/fonts/fonts.cpp4
-rw-r--r--kcontrol/iccconfig/iccconfig.cpp6
-rw-r--r--kcontrol/input/Makefile.am2
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp4
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp7
-rw-r--r--kcontrol/kdm/kdm-appear.cpp2
-rw-r--r--kcontrol/keys/keyconfig.cpp12
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp4
-rw-r--r--kcontrol/konqhtml/domainlistview.cpp2
-rw-r--r--kcontrol/konqhtml/jspolicies.cpp2
-rw-r--r--kcontrol/konsole/sessioneditor.cpp4
-rw-r--r--kcontrol/launch/kcmlaunch.cpp12
-rw-r--r--kcontrol/locale/kcmlocale.cpp14
-rw-r--r--kcontrol/locale/localetime.cpp6
-rw-r--r--kcontrol/screensaver/scrnsave.cpp16
-rw-r--r--kcontrol/usbview/usbdevices.cpp4
-rw-r--r--kcontrol/view1394/view1394.cpp1
-rw-r--r--kcontrol/view1394/view1394.h1
-rw-r--r--kcontrol/view1394/view1394widget.ui8
24 files changed, 78 insertions, 73 deletions
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 8239d2997..88c8e7fe9 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -297,7 +297,7 @@ void KArtsModule::load( bool useDefaults )
{
if(a->name == audioIO) // first item: "autodetect"
{
- hardware->audioIO->setCurrentItem(audioIOList.at() + 1);
+ hardware->audioIO->setCurrentItem(audioIOList.tqat() + 1);
break;
}
@@ -334,7 +334,7 @@ void KArtsModule::saveParams( void )
int item = hardware->audioIO->currentItem() - 1; // first item: "default"
if (item >= 0) {
- audioIO = audioIOList.at(item)->name;
+ audioIO = audioIOList.tqat(item)->name;
}
TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null;
@@ -498,7 +498,7 @@ void KArtsModule::updateWidgets()
int item = hardware->audioIO->currentItem() - 1; // first item: "default"
if (item >= 0)
{
- audioIO = audioIOList.at(item)->name;
+ audioIO = audioIOList.tqat(item)->name;
bool jack = (audioIO == TQString::tqfromLatin1("jack"));
if(jack)
{
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 1683b49a0..6548b066d 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -148,7 +148,7 @@ bool KBackgroundPattern::isAvailable()
if (m_Pattern.isEmpty())
return false;
TQString file = m_Pattern;
- if (file.at(0) != '/')
+ if (file.tqat(0) != '/')
file = m_pDirs->findResource("dtop_pattern", file);
TQFileInfo fi(file);
return (fi.exists());
@@ -895,7 +895,7 @@ void KBackgroundSettings::randomizeWallpaperFiles()
tmpList.pop_front();
while(tmpList.count())
{
- randomList.insert(randomList.at(
+ randomList.insert(randomList.tqat(
rseq.getLong(randomList.count()+1)),
1, tmpList.front());
@@ -985,7 +985,7 @@ bool KBackgroundSettings::discardCurrentWallpaper()
{
return false;
}
- m_WallpaperFiles.remove(m_WallpaperFiles.at(m_CurrentWallpaper));
+ m_WallpaperFiles.remove(m_WallpaperFiles.tqat(m_CurrentWallpaper));
--m_CurrentWallpaper;
changeWallpaper();
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 10d774da7..fd2aaafb3 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -74,7 +74,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
box->setColumnLayout( 0, Qt::Horizontal );
layout->addWidget(box);
layout->addStretch();
- TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
+ TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint());
grid->setColStretch(0, 0);
grid->setColStretch(1, 1);
grid->addColSpacing(0, 30);
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 39c1d55b9..38a4ea444 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -440,7 +440,7 @@ void KColorScheme::sliderValueChanged( int val )
void KColorScheme::slotSave( )
{
- KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
+ KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
if (!entry) return;
sCurrentScheme = entry->path;
KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
@@ -482,7 +482,7 @@ void KColorScheme::slotSave( )
void KColorScheme::slotRemove()
{
uint ind = sList->currentItem();
- KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes);
+ KColorSchemeEntry *entry = mSchemeList->tqat(ind-nSysSchemes);
if (!entry) return;
if (unlink(TQFile::encodeName(entry->path).data())) {
@@ -497,7 +497,7 @@ void KColorScheme::slotRemove()
mSchemeList->remove(entry);
ind = sList->currentItem();
- entry = mSchemeList->at(ind-nSysSchemes);
+ entry = mSchemeList->tqat(ind-nSysSchemes);
if (!entry) return;
removeBt->setEnabled(entry ? entry->local : false);
}
@@ -795,7 +795,7 @@ void KColorScheme::readScheme( int index )
config->setGroup("General");
} else {
// Open scheme file
- KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
+ KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes);
if (!entry) return;
sCurrentScheme = entry->path;
config = new KSimpleConfig(sCurrentScheme, true);
@@ -941,7 +941,7 @@ void KColorScheme::slotPreviewScheme(int indx)
removeBt->setEnabled(false);
else
{
- KColorSchemeEntry *entry = mSchemeList->at(indx-nSysSchemes);
+ KColorSchemeEntry *entry = mSchemeList->tqat(indx-nSysSchemes);
removeBt->setEnabled(entry ? entry->local : false);
}
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index abe1e5c74..403219de8 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -417,7 +417,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
TQWidget *newConfigWidget = 0;
if (cfgType.isEmpty() || (cfgType=="component"))
{
- if (!(configWidget && configWidget->tqqt_cast("CfgComponent")))
+ if (!(configWidget && configWidget->qt_cast("CfgComponent")))
{
CfgComponent* cfgcomp = new CfgComponent(configContainer);
cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text()));
@@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_email")
{
- if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient")))
+ if (!(configWidget && configWidget->qt_cast("CfgEmailClient")))
{
newConfigWidget = new CfgEmailClient(configContainer);
}
@@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_terminal")
{
- if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator")))
+ if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator")))
{
newConfigWidget = new CfgTerminalEmulator(configContainer);
}
@@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_browser")
{
- if (!(configWidget && configWidget->tqqt_cast("CfgBrowser")))
+ if (!(configWidget && configWidget->qt_cast("CfgBrowser")))
{
newConfigWidget = new CfgBrowser(configContainer);
}
@@ -465,7 +465,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
if (configWidget)
- static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg);
+ static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg);
emitChanged(false);
latestEditedService=static_cast<MyListBoxItem*>(it)->File;
@@ -487,7 +487,7 @@ void ComponentChooser::load() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
- configWidget->tqqt_cast( "CfgPlugin" ) );
+ configWidget->qt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@@ -500,7 +500,7 @@ void ComponentChooser::save() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
- configWidget->tqqt_cast( "CfgPlugin" ) );
+ configWidget->qt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@@ -512,7 +512,7 @@ void ComponentChooser::save() {
void ComponentChooser::restoreDefault() {
if (configWidget)
{
- static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults();
+ static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults();
emitChanged(true);
}
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index b082cf1fa..481ae9c7f 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -688,7 +688,7 @@ void KFonts::load()
void KFonts::load( bool useDefaults )
{
for ( uint i = 0; i < fontUseList.count(); i++ )
- fontUseList.at( i )->readFont( useDefaults );
+ fontUseList.tqat( i )->readFont( useDefaults );
useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
cbAA->setCurrentItem( useAA );
@@ -779,7 +779,7 @@ void KFonts::slotApplyFontDiff()
if (ret == KDialog::Accepted && fontDiffFlags)
{
for ( int i = 0; i < (int) fontUseList.count(); i++ )
- fontUseList.at( i )->applyFontDiff( font,fontDiffFlags );
+ fontUseList.tqat( i )->applyFontDiff( font,fontDiffFlags );
emit changed(true);
}
}
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index e78a70af2..6556b912d 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -286,7 +286,7 @@ void KICCConfig::load(bool useDefaults )
base->deleteProfileButton->setFixedWidth(90);
XRROutputInfo *output_info;
- KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
+ KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
config->setReadDefaults( useDefaults );
@@ -356,7 +356,7 @@ void KICCConfig::save()
{
int i;
int j;
- KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
+ KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
// Write system configuration
systemconfig->setGroup(NULL);
@@ -408,4 +408,4 @@ TQString KICCConfig::quickHelp() const
" for a more lifelike and vibrant image.");
}
-#include "iccconfig.moc" \ No newline at end of file
+#include "iccconfig.moc"
diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am
index 7a852aa3e..7ac995b97 100644
--- a/kcontrol/input/Makefile.am
+++ b/kcontrol/input/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS = kapplymousetheme
kapplymousetheme_SOURCES = kapplymousetheme.cpp
kapplymousetheme_LDFLAGS = $(all_libraries)
-kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11)
+kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) $(LIB_QT)
kde_module_LTLIBRARIES = kcm_input.la
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index e0b33cf1b..17bf227f4 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget()
void PreviewWidget::setTheme( const TQString &theme )
{
- setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
int minHeight = previewSize + 20; // Minimum height of the preview widget
int maxHeight = height(); // Tallest cursor height
@@ -302,7 +302,7 @@ void PreviewWidget::setTheme( const TQString &theme )
current = -1;
setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
- setUpdatesEnabled( true );
+ tqsetUpdatesEnabled( true );
tqrepaint( false );
}
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index f3b80bda0..dde14168b 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -256,7 +256,12 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
ProxyWidget::~ProxyWidget()
{
- delete _client;
+#ifdef USE_QT4
+ #warning Possible memory leak in ProxyWidget::~ProxyWidget()
+#else // USE_QT4
+ if (_client) delete _client;
+ _client = 0;
+#endif // USE_QT4
}
TQString ProxyWidget::quickHelp() const
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 90631e3bf..103a2f33b 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
loadLanguageList(langcombo);
connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
label = new TQLabel(langcombo, i18n("Languag&e:"), group);
- TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
+ TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1);
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 0bd08b1fd..239873a24 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -238,7 +238,7 @@ void KKeyModule::defaults()
uint ind = sList->currentItem();
- if ( !d.remove( *sFileList->at( ind ) ) ) {
+ if ( !d.remove( *sFileList->tqat( ind ) ) ) {
KMessageBox::sorry( 0,
i18n("This key scheme could not be removed.\n"
"Perhaps you do not have permission to alter the file "
@@ -247,7 +247,7 @@ void KKeyModule::defaults()
}
sList->removeItem( ind );
- sFileList->remove( sFileList->at(ind) );
+ sFileList->remove( sFileList->tqat(ind) );
}*/
void KKeyModule::slotKeyChange()
@@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange()
/*void KKeyModule::slotSave( )
{
- KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
+ KSimpleConfig config(*sFileList->tqat( sList->currentItem() ) );
// global=true is necessary in order to
// let both 'Global Shortcuts' and 'Shortcut Sequences' be
// written to the same scheme file.
@@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index )
else {
KConfigBase* config = 0;
if( index == 0 ) config = new KConfig( "kdeglobals" );
- //else config = new KSimpleConfig( *sFileList->at( index ), true );
+ //else config = new KSimpleConfig( *sFileList->tqat( index ), true );
actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
kc->listSync();
@@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index )
// Set various appropriate for the scheme
if ( indx < nSysSchemes ||
- (*sFileList->at(indx)).tqcontains( "/global-" ) ||
- (*sFileList->at(indx)).tqcontains( "/app-" ) ) {
+ (*sFileList->tqat(indx)).tqcontains( "/global-" ) ||
+ (*sFileList->tqat(indx)).tqcontains( "/app-" ) ) {
removeBt->setEnabled( FALSE );
} else {
removeBt->setEnabled( TRUE );
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index ab84300d4..3a03c4d69 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -241,9 +241,9 @@ void DesktopBehavior::setMediaListViewEnabled(bool enabled)
it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling()))
{
if (it->mimeType().startsWith("media/builtin-") == false)
- it->setVisible(enabled);
+ it->tqsetVisible(enabled);
else
- it->setVisible(TRUE);
+ it->tqsetVisible(TRUE);
}
}
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index a2c7ceb53..4927eda48 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -38,7 +38,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(0);
layout()->setMargin(0);
- TQGridLayout* thisLayout = new TQGridLayout(layout());
+ TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
thisLayout->tqsetAlignment(Qt::AlignTop);
thisLayout->setSpacing(KDialog::spacingHint());
thisLayout->setMargin(KDialog::marginHint());
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index eeedca18a..88baa1103 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -135,7 +135,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
setColumnLayout(0, Qt::Vertical);
layout()->setSpacing(0);
layout()->setMargin(0);
- TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
+ TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2);
this_layout->tqsetAlignment(Qt::AlignTop);
this_layout->setSpacing(3);
this_layout->setMargin(11);
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index e93084af1..188b0c910 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -340,8 +340,8 @@ void SessionEditor::saveCurrent()
else
co->writeEntry("Font",fontCombo->currentItem()-1);
co->writeEntry("Term",termLine->text());
- co->writeEntry("KeyTab",*keytabFilename.at(keytabCombo->currentItem()));
- co->writeEntry("Schema",*schemaFilename.at(schemaCombo->currentItem()));
+ co->writeEntry("KeyTab",*keytabFilename.tqat(keytabCombo->currentItem()));
+ co->writeEntry("Schema",*schemaFilename.tqat(schemaCombo->currentItem()));
co->sync();
delete co;
sesMod=false;
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index ba6193107..f73303bc0 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
"given in the section 'Startup indication timeout'"));
GroupBox1->setColumnLayout(0, Qt::Vertical );
- GroupBox1->layout()->setSpacing( 0 );
- GroupBox1->layout()->setMargin( 0 );
+ GroupBox1->tqlayout()->setSpacing( 0 );
+ GroupBox1->tqlayout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox1 );
- TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 );
+ TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );
GroupBox1Layout->setColStretch( 1, 1 );
@@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
"given in the section 'Startup indication timeout'"));
GroupBox2->setColumnLayout( 0, Qt::Vertical );
- GroupBox2->layout()->setSpacing( 0 );
- GroupBox2->layout()->setMargin( 0 );
+ GroupBox2->tqlayout()->setSpacing( 0 );
+ GroupBox2->tqlayout()->setMargin( 0 );
Form1Layout->addWidget( GroupBox2 );
- TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 );
+ TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 );
GroupBox2Layout->setSpacing( 6 );
GroupBox2Layout->setMargin( 11 );
GroupBox2Layout->setColStretch( 1, 1 );
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index a192bf608..81b899caa 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -174,12 +174,12 @@ void KLocaleConfig::slotAddLanguage(const TQString & code)
// If it's already in list, just move it (delete the old, then insert a new)
int oldPos = languageList.tqfindIndex( code );
if ( oldPos != -1 )
- languageList.remove( languageList.at(oldPos) );
+ languageList.remove( languageList.tqat(oldPos) );
if ( oldPos != -1 && oldPos < pos )
--pos;
- TQStringList::Iterator it = languageList.at( pos );
+ TQStringList::Iterator it = languageList.tqat( pos );
languageList.insert( it, code );
@@ -195,7 +195,7 @@ void KLocaleConfig::slotRemoveLanguage()
TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
- TQStringList::Iterator it = languageList.at( pos );
+ TQStringList::Iterator it = languageList.tqat( pos );
if ( it != languageList.end() )
{
@@ -214,8 +214,8 @@ void KLocaleConfig::slotLanguageUp()
TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
- TQStringList::Iterator it1 = languageList.at( pos - 1 );
- TQStringList::Iterator it2 = languageList.at( pos );
+ TQStringList::Iterator it1 = languageList.tqat( pos - 1 );
+ TQStringList::Iterator it2 = languageList.tqat( pos );
if ( it1 != languageList.end() && it2 != languageList.end() )
{
@@ -236,8 +236,8 @@ void KLocaleConfig::slotLanguageDown()
TQStringList languageList = m_locale->languageList();
int pos = m_languages->currentItem();
- TQStringList::Iterator it1 = languageList.at( pos );
- TQStringList::Iterator it2 = languageList.at( pos + 1 );
+ TQStringList::Iterator it1 = languageList.tqat( pos );
+ TQStringList::Iterator it2 = languageList.tqat( pos + 1 );
if ( it1 != languageList.end() && it2 != languageList.end() )
{
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 4650e6a23..7832d90d6 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -150,7 +150,7 @@ TQString KLocaleConfigTime::userToStore(const TQValueList<StringPair> & list,
if ( !bFound )
{
- TQChar c = userFormat.at( pos );
+ TQChar c = userFormat.tqat( pos );
if ( c == '%' )
result += c;
@@ -169,7 +169,7 @@ TQString KLocaleConfigTime::storeToUser(const TQValueList<StringPair> & list,
bool escaped = false;
for ( uint pos = 0; pos < storeFormat.length(); ++pos )
{
- TQChar c = storeFormat.at(pos);
+ TQChar c = storeFormat.tqat(pos);
if ( escaped )
{
StringPair it = StringPair::find( list, c );
@@ -323,7 +323,7 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem)
TQString calendarType;
bool ok;
- calendarType = calendars.at(calendarSystem, &ok);
+ calendarType = calendars.tqat(calendarSystem, &ok);
if ( !ok )
calendarType = calendars.first();
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 7582aea53..d4470be06 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -537,7 +537,7 @@ void KScreenSaver::findSavers()
mSaverListView->setSelected(selectedItem, true);
mSaverListView->setCurrentItem(selectedItem);
mSaverListView->ensureItemVisible(selectedItem);
- mSetupBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty());
+ mSetupBt->setEnabled(!mSaverList.tqat(mSelected)->setup().isEmpty());
mTestBt->setEnabled(true);
}
@@ -587,7 +587,7 @@ void KScreenSaver::slotPreviewExited(KProcess *)
if (mSelected >= 0) {
mPreviewProc->clearArguments();
- TQString saver = mSaverList.at(mSelected)->saver();
+ TQString saver = mSaverList.tqat(mSelected)->saver();
TQTextStream ts(&saver, IO_ReadOnly);
TQString word;
@@ -665,9 +665,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item)
bool bChanged = (indx != mSelected);
if (!mSetupProc->isRunning())
- mSetupBt->setEnabled(!mSaverList.at(indx)->setup().isEmpty());
+ mSetupBt->setEnabled(!mSaverList.tqat(indx)->setup().isEmpty());
mTestBt->setEnabled(true);
- mSaver = mSaverList.at(indx)->file();
+ mSaver = mSaverList.tqat(indx)->file();
mSelected = indx;
setMonitor();
@@ -690,7 +690,7 @@ void KScreenSaver::slotSetup()
mSetupProc->clearArguments();
- TQString saver = mSaverList.at(mSelected)->setup();
+ TQString saver = mSaverList.tqat(mSelected)->setup();
if( saver.isEmpty())
return;
TQTextStream ts(&saver, IO_ReadOnly);
@@ -708,7 +708,7 @@ void KScreenSaver::slotSetup()
if (!kxsconfig) {
word = "-caption";
(*mSetupProc) << word;
- word = mSaverList.at(mSelected)->name();
+ word = mSaverList.tqat(mSelected)->name();
(*mSetupProc) << word;
word = "-icon";
(*mSetupProc) << word;
@@ -724,7 +724,7 @@ void KScreenSaver::slotSetup()
// Pass translated name to kxsconfig
if (kxsconfig) {
- word = mSaverList.at(mSelected)->name();
+ word = mSaverList.tqat(mSelected)->name();
(*mSetupProc) << word;
}
@@ -758,7 +758,7 @@ void KScreenSaver::slotTest()
}
mTestProc->clearArguments();
- TQString saver = mSaverList.at(mSelected)->saver();
+ TQString saver = mSaverList.tqat(mSelected)->saver();
TQTextStream ts(&saver, IO_ReadOnly);
TQString word;
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 63a049742..74fcf3609 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -226,9 +226,9 @@ TQString USBDevice::dump()
r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power);
else
r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>");
- r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0));
+ r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.tqat(0));
if ( _devnodes.count() > 1 )
- for ( TQStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it )
+ for ( TQStringList::Iterator it = _devnodes.tqat(1); it != _devnodes.end(); ++it )
r += "<tr><td></td><td>" + *it + "</td></tr>";
#else
r += i18n("<tr><td><i>Max. Packet Size</i></td><td>%1</td></tr>").arg(_maxPacketSize);
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index b178e07e3..795b58492 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -20,7 +20,6 @@
#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <tqlistview.h>
#include <tqfile.h>
#include <tqtextstream.h>
diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h
index 24a68de8a..6d7a3b2c9 100644
--- a/kcontrol/view1394/view1394.h
+++ b/kcontrol/view1394/view1394.h
@@ -28,6 +28,7 @@
#include <tqstring.h>
#include <tqtimer.h>
#include <tqvaluelist.h>
+#include <tqlistview.h>
#include "view1394widget.h"
diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui
index a249fb195..eb18e710a 100644
--- a/kcontrol/view1394/view1394widget.ui
+++ b/kcontrol/view1394/view1394widget.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>View1394Widget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>View1394Widget</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QListView">
+ <widget class="TQListView">
<column>
<property name="text">
<string>Name</string>
@@ -145,7 +145,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout1</cstring>
</property>
@@ -170,7 +170,7 @@
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_busResetPb</cstring>
</property>