diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:53:50 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:26:29 +0200 |
| commit | a5b44fbe44e58478ad74d819c5f4c36926d31872 (patch) | |
| tree | fa07b25a5c2a60b5e0b438a0af16d06c9a5ac498 | |
| parent | 6a1f2b1b6b19b0dd47b1e58afff29a12ae158226 (diff) | |
| download | tdebase-a5b44fbe44e58478ad74d819c5f4c36926d31872.tar.gz tdebase-a5b44fbe44e58478ad74d819c5f4c36926d31872.zip | |
Remove additional unneeded tq method conversions
(cherry picked from commit f64397c82fa94371ab4a64af28c4d0029f4cd93f)
284 files changed, 1123 insertions, 1123 deletions
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 3574756e4..3253d61f2 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -332,12 +332,12 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin) for (uint i=0; i<pluginPages.count(); i++) { - if ( pluginPages.tqat(i)->plugin == plugin ) + if ( pluginPages.at(i)->plugin == plugin ) { - TQWidget *w = pluginPages.tqat(i)->page->parentWidget(); - delete pluginPages.tqat(i)->page; + TQWidget *w = pluginPages.at(i)->page->parentWidget(); + delete pluginPages.at(i)->page; delete w; - pluginPages.remove(pluginPages.tqat(i)); + pluginPages.remove(pluginPages.at(i)); i--; } } @@ -415,7 +415,7 @@ void KateConfigDialog::slotApply() // for (uint i=0; i<editorPages.count(); i++) { - editorPages.tqat(i)->apply(); + editorPages.at(i)->apply(); } v->getDoc()->writeConfig(config); @@ -425,7 +425,7 @@ void KateConfigDialog::slotApply() // for (uint i=0; i<pluginPages.count(); i++) { - pluginPages.tqat(i)->page->apply(); + pluginPages.at(i)->page->apply(); } config->sync(); diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index 4751d8bde..05af748fa 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -69,7 +69,7 @@ KateDocManager::~KateDocManager () { // save config if (!m_docList.isEmpty()) - m_docList.tqat(0)->writeConfig(KateApp::self()->config()); + m_docList.at(0)->writeConfig(KateApp::self()->config()); if (m_saveMetaInfos) { @@ -150,7 +150,7 @@ void KateDocManager::deleteDoc (Kate::Document *doc) Kate::Document *KateDocManager::document (uint n) { - return m_docList.tqat(n); + return m_docList.at(n); } Kate::Document *KateDocManager::activeDocument () @@ -234,7 +234,7 @@ bool KateDocManager::isOpen(KURL url) Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encoding, uint *id, bool isTempFile) { // special handling if still only the first initial doc is there - if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().tqat(0)->isModified() && documentList().tqat(0)->url().isEmpty())) + if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().at(0)->isModified() && documentList().at(0)->url().isEmpty())) { Kate::Document* doc = documentList().getFirst(); @@ -354,7 +354,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL) } while (!docs.isEmpty() && res) - if (! closeDocument(docs.tqat(0),closeURL) ) + if (! closeDocument(docs.at(0),closeURL) ) res = false; else docs.remove ((uint)0); @@ -364,7 +364,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL) KateApp::self()->mainWindow(i)->viewManager()->setViewActivationBlocked(false); for (uint s=0; s < KateApp::self()->mainWindow(i)->viewManager()->containers()->count(); s++) - KateApp::self()->mainWindow(i)->viewManager()->containers()->tqat(s)->activateView (m_docList.tqat(0)->documentNumber()); + KateApp::self()->mainWindow(i)->viewManager()->containers()->at(s)->activateView (m_docList.at(0)->documentNumber()); } return res; diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index c0daf314b..ec1e92847 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leName = new TQLineEdit( w ); lo->addWidget( leName, 1, 2 ); l = new TQLabel( leName, i18n("&Label:"), w ); - l->setAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 1, 1 ); if ( tool ) leName->setText( tool->name ); TQWhatsThis::add( leName, i18n( @@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leExecutable = new TQLineEdit( w ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); l = new TQLabel( leExecutable, i18n("&Executable:"), w ); - l->setAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 3, 1 ); if ( tool ) leExecutable->setText( tool->tryexec ); TQWhatsThis::add( leExecutable, i18n( @@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leMimetypes = new TQLineEdit( w ); lo->addWidget( leMimetypes, 4, 2 ); l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); - l->setAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 4, 1 ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); TQWhatsThis::add( leMimetypes, i18n( @@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * cmbSave = new TQComboBox(w); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); l = new TQLabel( cmbSave, i18n("&Save:"), w ); - l->setAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 5, 1 ); TQStringList sl; sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); @@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leCmdLine = new TQLineEdit( w ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); - l->setAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 6, 1 ); if ( tool ) leCmdLine->setText( tool->cmdname ); TQWhatsThis::add( leCmdLine, i18n( diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 4ae91fe3a..8d34c3893 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -272,8 +272,8 @@ void KateFileList::slotModChanged (Kate::Document *doc) for ( uint i=0; i < m_editHistory.count(); i++ ) { - m_editHistory.tqat( i )->setEditHistPos( i+1 ); - repaintItem( m_editHistory.tqat( i ) ); + m_editHistory.at( i )->setEditHistPos( i+1 ); + repaintItem( m_editHistory.at( i ) ); } } else @@ -334,7 +334,7 @@ void KateFileList::slotViewChanged () // int p = 0; // if ( m_viewHistory.count() ) // { -// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it +// int p = m_viewHistory.findRef( item ); // only repaint items that needs it // } m_viewHistory.removeRef( item ); @@ -342,8 +342,8 @@ void KateFileList::slotViewChanged () for ( uint i=0; i < m_viewHistory.count(); i++ ) { - m_viewHistory.tqat( i )->setViewHistPos( i+1 ); - repaintItem( m_viewHistory.tqat( i ) ); + m_viewHistory.at( i )->setViewHistPos( i+1 ); + repaintItem( m_viewHistory.at( i ) ); } } @@ -616,7 +616,7 @@ void KFLConfigPage::apply() m_filelist->m_editShade = kcbEditShade->color(); m_filelist->m_enableBgShading = cbEnableShading->isChecked(); m_filelist->setSortType( cmbSort->currentItem() ); - // tqrepaint the affected items + // repaint the affected items m_filelist->triggerUpdate(); } diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 4fc9080cb..a0cce60d6 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -544,10 +544,10 @@ void KateMainWindow::editKeys() TQPtrList<Kate::Document> l=KateDocManager::self()->documentList(); for (uint i=0;i<l.count();i++) { // kdDebug(13001)<<"reloading Keysettings for document "<<i<<endl; - l.tqat(i)->reloadXML(); - TQPtrList<class KTextEditor::View> l1=l.tqat(i)->views ();//KTextEditor::Document + l.at(i)->reloadXML(); + TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document for (uint i1=0;i1<l1.count();i1++) { - l1.tqat(i1)->reloadXML(); + l1.at(i1)->reloadXML(); // kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl; } } diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index 6e0d28a1d..09257300c 100644 --- a/kate/app/katesavemodifieddialog.cpp +++ b/kate/app/katesavemodifieddialog.cpp @@ -152,7 +152,7 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate: m_documentRoot=new TQListViewItem(m_list,i18n("Documents")); const uint docCnt=documents.count(); for (uint i=0;i<docCnt;i++) { - new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.tqat(i)); + new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.at(i)); } m_documentRoot->setOpen(true); } else m_documentRoot=0; diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp index 13a099730..e2ac7e8b3 100644 --- a/kate/app/katetabwidget.cpp +++ b/kate/app/katetabwidget.cpp @@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void KateTabWidget::removePage ( TQWidget * w ) diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 6d95efbb0..75cc4b15c 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -316,7 +316,7 @@ uint KateViewManager::viewCount () { uint viewCount=0; for (uint i=0;i<m_viewSpaceContainerList.count();i++) { - viewCount+=m_viewSpaceContainerList.tqat(i)->viewCount(); + viewCount+=m_viewSpaceContainerList.at(i)->viewCount(); } return viewCount; @@ -326,7 +326,7 @@ uint KateViewManager::viewSpaceCount () { uint viewSpaceCount=0; for (uint i=0;i<m_viewSpaceContainerList.count();i++) { - viewSpaceCount+=m_viewSpaceContainerList.tqat(i)->viewSpaceCount(); + viewSpaceCount+=m_viewSpaceContainerList.at(i)->viewSpaceCount(); } return viewSpaceCount; } @@ -334,7 +334,7 @@ uint KateViewManager::viewSpaceCount () void KateViewManager::setViewActivationBlocked (bool block) { for (uint i=0;i<m_viewSpaceContainerList.count();i++) - m_viewSpaceContainerList.tqat(i)->m_blockViewCreationAndActivation=block; + m_viewSpaceContainerList.at(i)->m_blockViewCreationAndActivation=block; } void KateViewManager::activateNextView() @@ -354,7 +354,7 @@ void KateViewManager::activatePrevView() void KateViewManager::closeViews(uint documentNumber) { for (uint i=0;i<m_viewSpaceContainerList.count();i++) { - m_viewSpaceContainerList.tqat(i)->closeViews(documentNumber); + m_viewSpaceContainerList.at(i)->closeViews(documentNumber); } tabChanged(m_currentContainer); } @@ -454,7 +454,7 @@ void KateViewManager::setShowFullPath( bool enable ) { showFullPath=enable; for (uint i=0;i<m_viewSpaceContainerList.count();i++) { - m_viewSpaceContainerList.tqat(i)->setShowFullPath(enable); + m_viewSpaceContainerList.at(i)->setShowFullPath(enable); } m_mainWindow->slotWindowActivated (); } @@ -477,7 +477,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp) config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count()); config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex()); for (uint i=0;i<m_viewSpaceContainerList.count();i++) { - m_viewSpaceContainerList.tqat(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); + m_viewSpaceContainerList.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); } } @@ -495,10 +495,10 @@ void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString& uint tabCount=config->readNumEntry("ViewSpaceContainers",0); int activeOne=config->readNumEntry("Active ViewSpaceContainer",0); if (tabCount==0) return; - m_viewSpaceContainerList.tqat(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:")); + m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:")); for (uint i=1;i<tabCount;i++) { slotNewTab(); - m_viewSpaceContainerList.tqat(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); + m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); } if (activeOne != m_mainWindow->tabWidget()->currentPageIndex()) diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index d5fd5f76b..76db12a07 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -342,8 +342,8 @@ void KateViewSpaceContainer::activateNextView() if (i >= m_viewSpaceList.count()) i=0; - setActiveSpace (m_viewSpaceList.tqat(i)); - activateView(m_viewSpaceList.tqat(i)->currentView()); + setActiveSpace (m_viewSpaceList.at(i)); + activateView(m_viewSpaceList.at(i)->currentView()); } void KateViewSpaceContainer::activatePrevView() @@ -353,8 +353,8 @@ void KateViewSpaceContainer::activatePrevView() if (i < 0) i=m_viewSpaceList.count()-1; - setActiveSpace (m_viewSpaceList.tqat(i)); - activateView(m_viewSpaceList.tqat(i)->currentView()); + setActiveSpace (m_viewSpaceList.at(i)); + activateView(m_viewSpaceList.at(i)->currentView()); } void KateViewSpaceContainer::closeViews(uint documentNumber) @@ -363,7 +363,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber) for (uint z=0 ; z < m_viewList.count(); z++) { - Kate::View* current = m_viewList.tqat(z); + Kate::View* current = m_viewList.at(z); if ( current->getDoc()->documentNumber() == documentNumber ) { closeList.append (current); @@ -644,7 +644,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ { // send all views + their gui to **** ;) for (uint i=0; i < m_viewList.count(); i++) - mainWindow()->guiFactory ()->removeClient (m_viewList.tqat(i)); + mainWindow()->guiFactory ()->removeClient (m_viewList.at(i)); m_viewList.clear (); @@ -658,7 +658,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ // finally, make the correct view active. config->setGroup (group); /* - KateViewSpace *vs = m_viewSpaceList.tqat( config->readNumEntry("Active ViewSpace") ); + KateViewSpace *vs = m_viewSpaceList.at( config->readNumEntry("Active ViewSpace") ); if ( vs ) activateSpace( vs->currentView() ); */ diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 41657a47a..35c41a411 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -474,7 +474,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents TQString buf = TQString("Document %1").arg(z); config->setGroup(buf); - KTextEditor::Document *doc = docList.tqat(z - 1); + KTextEditor::Document *doc = docList.at(z - 1); if (KTextEditor::configInterface(doc)) KTextEditor::configInterface(doc)->writeSessionConfig(config); @@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents TQString buf = TQString("Window %1").arg(z); config->setGroup(buf); - config->writeEntry("DocumentNumber",docList.find(winList.tqat(z-1)->view()->document()) + 1); + config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1); } } @@ -521,7 +521,7 @@ void KWrite::restore() { buf = TQString("Window %1").arg(z); config->setGroup(buf); - t = new KWrite(docList.tqat(config->readNumEntry("DocumentNumber") - 1)); + t = new KWrite(docList.at(config->readNumEntry("DocumentNumber") - 1)); t->restore(config,z); } } diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui index 403dba661..3d94b4dda 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Ma&ximum speed:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Acceleration &time:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>&Repeat interval:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Acceleration &profile:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>&Acceleration delay:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 44d35ca34..792951aec 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.tqat() + 1); + hardware->audioIO->setCurrentItem(audioIOList.at() + 1); break; } @@ -334,7 +334,7 @@ void KArtsModule::saveParams( void ) int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { - audioIO = audioIOList.tqat(item)->name; + audioIO = audioIOList.at(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.tqat(item)->name; + audioIO = audioIOList.at(item)->name; bool jack = (audioIO == TQString::fromLatin1("jack")); if(jack) { diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index c7635f2e0..0dec4f07e 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -441,14 +441,14 @@ void BGDialog::initUI() else { for (unsigned i = 0; i < (m_numDesks/m_numViewports); ++i) { for (unsigned j = 0; j < m_numViewports; ++j) { - m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").tqarg(i+1).tqarg(j+1)); + m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").arg(i+1).arg(j+1)); } } } // Screens for (unsigned i = 0; i < m_numScreens; ++i) - m_comboScreen->insertItem( i18n("Screen %1").tqarg(TQString::number(i+1)) ); + m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) ); // Patterns m_comboPattern->insertItem(i18n("Single Color")); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 65ef3c12b..3b67667a2 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -129,7 +129,7 @@ TQString KBackgroundRenderer::buildCommand() if (pos == (int) (cmd.length() - 1)) break; - switch (cmd.tqat(pos+1).latin1()) { + switch (cmd.at(pos+1).latin1()) { case 'f': createTempFile(); cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name())); diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index c98376cc4..818a00f31 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.tqat(0) != '/') + if (file.at(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.tqat( + randomList.insert(randomList.at( rseq.getLong(randomList.count()+1)), 1, tmpList.front()); @@ -985,7 +985,7 @@ bool KBackgroundSettings::discardCurrentWallpaper() { return false; } - m_WallpaperFiles.remove(m_WallpaperFiles.tqat(m_CurrentWallpaper)); + m_WallpaperFiles.remove(m_WallpaperFiles.at(m_CurrentWallpaper)); --m_CurrentWallpaper; changeWallpaper(); diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index 96183b73d..109e436c4 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -293,7 +293,7 @@ void Dtime::save() proc << ntpUtility << timeServer; proc.start( KProcess::Block ); if( proc.exitStatus() != 0 ){ - KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").tqarg(timeServer).latin1())); + KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1())); setDateTimeAuto->setChecked( false ); } else { @@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const void Kclock::setTime(const TQTime &time) { this->time = time; - tqrepaint(); + repaint(); } void Kclock::paintEvent( TQPaintEvent * ) diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 53325c9c5..9498a062a 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -77,7 +77,7 @@ void Tzone::currentZone() time_t now = time(0); tzset(); strftime(result.data(), result.size(), "%Z", localtime(&now)); - m_local->setText(localZone.tqarg(KTimezoneWidget::displayName(m_zoneDb.local())).tqarg(static_cast<const char *>(result))); + m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(static_cast<const char *>(result))); } // FIXME: Does the logic in this routine actually work correctly? For example, diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 2a9085b97..b66d839fc 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->tqat(sList->currentItem()-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->at(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->tqat(ind-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->at(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->tqat(ind-nSysSchemes); + entry = mSchemeList->at(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->tqat(sList->currentItem()-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->at(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->tqat(indx-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->at(indx-nSysSchemes); removeBt->setEnabled(entry ? entry->local : false); } diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 59d6f4731..1de1ccae1 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets() #ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); #endif - vertScrollBar->tqrepaint(); + vertScrollBar->repaint(); TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); @@ -592,5 +592,5 @@ void WidgetCanvas::drawSampleWidgets() hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - tqrepaint( FALSE ); + repaint( FALSE ); } diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui index 8af26fab9..6778e5a7d 100644 --- a/kcontrol/componentchooser/componentchooser_ui.ui +++ b/kcontrol/componentchooser/componentchooser_ui.ui @@ -91,7 +91,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui index c0978f732..433e54b87 100644 --- a/kcontrol/componentchooser/componentconfig_ui.ui +++ b/kcontrol/componentchooser/componentconfig_ui.ui @@ -26,7 +26,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 9cb7cb67e..5cb1fb71c 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -1219,10 +1219,10 @@ void KDisplayConfig::setGammaLabels() { screendata->gamma_blue = floorf(screendata->gamma_blue * 10 + 0.5) / 10; // Set the labels - base->gammaAllLabel->setText(TQString("%1").tqarg(((float)base->gammaAllSlider->value())/10.0, 0, 'f', 1)); - base->gammaRedLabel->setText(TQString("%1").tqarg(((float)base->gammaRedSlider->value())/10.0, 0, 'f', 1)); - base->gammaGreenLabel->setText(TQString("%1").tqarg(((float)base->gammaGreenSlider->value())/10.0, 0, 'f', 1)); - base->gammaBlueLabel->setText(TQString("%1").tqarg(((float)base->gammaBlueSlider->value())/10.0, 0, 'f', 1)); + base->gammaAllLabel->setText(TQString("%1").arg(((float)base->gammaAllSlider->value())/10.0, 0, 'f', 1)); + base->gammaRedLabel->setText(TQString("%1").arg(((float)base->gammaRedSlider->value())/10.0, 0, 'f', 1)); + base->gammaGreenLabel->setText(TQString("%1").arg(((float)base->gammaGreenSlider->value())/10.0, 0, 'f', 1)); + base->gammaBlueLabel->setText(TQString("%1").arg(((float)base->gammaBlueSlider->value())/10.0, 0, 'f', 1)); } void KDisplayConfig::gammaSetAverageAllSlider() { diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index dc4164547..42bcd41cc 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -124,7 +124,7 @@ void KCMDnssd::load() while (avahiStatus.isRunning()) { kapp->processEvents(); } - int exitStatus = avahiStatus.exiStatus(); + int exitStatus = avahiStatus.exitStatus(); if (exitStatus == 0) { // disabled enableZeroconf->setChecked(false); } else if (exitStatus == 1) { // enabled diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 481ae9c7f..b082cf1fa 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.tqat( i )->readFont( useDefaults ); + fontUseList.at( 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.tqat( i )->applyFontDiff( font,fontDiffFlags ); + fontUseList.at( i )->applyFontDiff( font,fontDiffFlags ); emit changed(true); } } diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 6dd215f55..9f2b17e1b 100644 --- a/kcontrol/info/info_solaris.cpp +++ b/kcontrol/info/info_solaris.cpp @@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) { lBox->addColumn( i18n( "Mount Point" )); lBox->addColumn( i18n( "FS Type" )); lBox->addColumn( i18n( "Total Size" )); - // XXX: FIXME: how do I set column tqalignment correctly? + // XXX: FIXME: how do I set column alignment correctly? lBox->setColumnAlignment( 3, 2 ); lBox->addColumn( i18n( "Free Size" )); - // XXX: FIXME: how do I set column tqalignment correctly? + // XXX: FIXME: how do I set column alignment correctly? lBox->setColumnAlignment( 4, 2 ); lBox->addColumn( i18n( "Mount Time" )); lBox->addColumn( i18n( "Mount Options" )); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 306cdd751..372bb71b9 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -288,7 +288,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex, TQPixmap pm(width, height); TQPainter paint; - paint.tqbegin(&pm, this); + paint.begin(&pm, this); TQPen pen(TQColor(0, 0, 0)); diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui index 5dfcedb46..bd559b819 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -181,10 +181,10 @@ </widget> <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>cb_pointertqshape</cstring> + <cstring>cb_pointershape</cstring> </property> <property name="text"> - <string>Cha&nge pointer tqshape over icons</string> + <string>Cha&nge pointer shape over icons</string> </property> <property name="checked"> <bool>true</bool> @@ -283,7 +283,7 @@ <property name="text"> <string>Long</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -344,7 +344,7 @@ <connection> <sender>singleClick</sender> <signal>toggled(bool)</signal> - <receiver>cb_pointertqshape</receiver> + <receiver>cb_pointershape</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> @@ -364,7 +364,7 @@ <tabstop>rightHanded</tabstop> <tabstop>leftHanded</tabstop> <tabstop>singleClick</tabstop> - <tabstop>cb_pointertqshape</tabstop> + <tabstop>cb_pointershape</tabstop> <tabstop>cbAutoSelect</tabstop> <tabstop>slAutoSelect</tabstop> <tabstop>doubleClick</tabstop> diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui index acee892a0..8d8a6cf65 100644 --- a/kcontrol/input/logitechmouse_base.ui +++ b/kcontrol/input/logitechmouse_base.ui @@ -31,7 +31,7 @@ <property name="text"> <string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 1b64dbb9c..ccd4a0536 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -150,7 +150,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick())); @@ -506,7 +506,7 @@ void MouseConfig::load( bool useDefaults ) tab1->singleClick->setChecked( settings->singleClick ); tab1->doubleClick->setChecked(!settings->singleClick); - tab1->cb_pointertqshape->setChecked(settings->changeCursor); + tab1->cb_pointershape->setChecked(settings->changeCursor); tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 ); if ( settings->autoSelectDelay < 0 ) tab1->slAutoSelect->setValue( 0 ); @@ -564,7 +564,7 @@ void MouseConfig::save() settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1; settings->visualActivate = tab1->cbVisualActivate->isChecked(); // settings->changeCursor = tab1->singleClick->isChecked(); - settings->changeCursor = tab1->cb_pointertqshape->isChecked(); + settings->changeCursor = tab1->cb_pointershape->isChecked(); settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked(); settings->apply(); diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index c4b1ec6b0..ceb399648 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme ) current = -1; setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) ); setUpdatesEnabled( true ); - tqrepaint( false ); + repaint( false ); } diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index ff3db429c..9a4150678 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -170,7 +170,7 @@ void JoyWidget::init() // we found one - device->insertItem(TQString("%1 (%2)").tqarg(joy->text()).tqarg(joy->device())); + device->insertItem(TQString("%1 (%2)").arg(joy->text()).arg(joy->device())); // display values for first device if ( first ) diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 9b5ec5006..7421d353e 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -42,7 +42,7 @@ void HelpWidget::setText(const TQString& docPath, const TQString& text) helptext = text; else helptext = (text + i18n("<p>Use the \"What's This?\" (Shift+F1) to get help on specific options.</p><p>To read the full manual click <a href=\"%1\">here</a>.</p>") - .tqarg(static_cast<const char *>(docPath.local8Bit()))); + .arg(static_cast<const char *>(docPath.local8Bit()))); } void HelpWidget::setBaseText() diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index e605c0b67..956c6f4a9 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->tqat( ind ) ) ) { + if ( !d.remove( *sFileList->at( 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->tqat(ind) ); + sFileList->remove( sFileList->at(ind) ); }*/ void KKeyModule::slotKeyChange() @@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange() /*void KKeyModule::slotSave( ) { - KSimpleConfig config(*sFileList->tqat( sList->currentItem() ) ); + KSimpleConfig config(*sFileList->at( 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->tqat( index ), true ); + //else config = new KSimpleConfig( *sFileList->at( 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->tqat(indx)).contains( "/global-" ) || - (*sFileList->tqat(indx)).contains( "/app-" ) ) { + (*sFileList->at(indx)).contains( "/global-" ) || + (*sFileList->at(indx)).contains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index 5053d6bac..5ba10dd75 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -208,7 +208,7 @@ <property name="text"> <string>Min</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> @@ -250,7 +250,7 @@ <property name="text"> <string>Max</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index 89f000410..d1a0b2766 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -125,7 +125,7 @@ void ExtensionInfo::load() c.setGroup("General"); _position = c.readNumEntry ("Position", _position); - _tqalignment = c.readNumEntry ("Alignment", _tqalignment); + _alignment = c.readNumEntry ("Alignment", _alignment); _xineramaScreen = c.readNumEntry ("XineramaScreen", _xineramaScreen); _showLeftHB = c.readBoolEntry("ShowLeftHideButton", _showLeftHB); _showRightHB = c.readBoolEntry("ShowRightHideButton", _showRightHB); @@ -147,7 +147,7 @@ void ExtensionInfo::load() } _orig_position = _position; - _orig_tqalignment = _tqalignment; + _orig_alignment = _alignment; _orig_size = _size; _orig_customSize = _customSize; @@ -170,10 +170,10 @@ void ExtensionInfo::configChanged() _orig_position = _position = position; } - int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); - if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment) + int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); + if (alignment != _alignment && alignment != _orig_alignment) { - _orig_tqalignment = _tqalignment = tqalignment; + _orig_alignment = _alignment = alignment; } if (_resizeable) @@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults() { // defaults _position = 3; - _tqalignment = TQApplication::reverseLayout() ? 2 : 0; + _alignment = TQApplication::reverseLayout() ? 2 : 0; _xineramaScreen = TQApplication::desktop()->primaryScreen(); _size = 2; _showLeftHB = false; @@ -225,7 +225,7 @@ void ExtensionInfo::save() c.setGroup("General"); c.writeEntry("Position", _position); - c.writeEntry("Alignment", _tqalignment); + c.writeEntry("Alignment", _alignment); c.writeEntry("XineramaScreen", _xineramaScreen); c.writeEntry("ShowLeftHideButton", _showLeftHB); c.writeEntry("ShowRightHideButton", _showRightHB); @@ -251,7 +251,7 @@ void ExtensionInfo::save() } _orig_position = _position; - _orig_tqalignment = _tqalignment; + _orig_alignment = _alignment; _orig_size = _size; _orig_customSize = _customSize; diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h index 5b890d324..169322aa4 100644 --- a/kcontrol/kicker/extensionInfo.h +++ b/kcontrol/kicker/extensionInfo.h @@ -47,7 +47,7 @@ class ExtensionInfo // Configuration settings TQString _name; int _position; - int _tqalignment; + int _alignment; int _xineramaScreen; int _size; int _customSize; @@ -67,7 +67,7 @@ class ExtensionInfo // Original settings to ensure that we can figure out // what has changed externally to the panel vs within the panel int _orig_position; - int _orig_tqalignment; + int _orig_alignment; int _orig_size; int _orig_customSize; diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 6aca01f9c..d6b85c046 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -557,7 +557,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -598,7 +598,7 @@ <property name="text"> <string>Medium</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index c78c5d4f9..48461ac03 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -449,7 +449,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index fa145433a..ac367a15f 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -132,7 +132,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="whatsThis" stdset="0"> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 9a5e48d8e..dd3a5ec91 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem) m_customSpinbox->setValue(m_panelInfo->_customSize); m_sizeGroup->setEnabled(m_panelInfo->_resizeable); m_panelPos = m_panelInfo->_position; - m_panelAlign = m_panelInfo->_tqalignment; + m_panelAlign = m_panelInfo->_alignment; if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens()) m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen); else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */ @@ -672,7 +672,7 @@ void PositionTab::storeInfo() } m_panelInfo->_position = m_panelPos; - m_panelInfo->_tqalignment = m_panelAlign; + m_panelInfo->_alignment = m_panelAlign; if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1) m_panelInfo->_xineramaScreen = -2; /* all screens */ else diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 8c832e770..1a20fd27b 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -231,7 +231,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget TQFontDatabase db; - m_families = db.tqfamilies(); + m_families = db.families(); m_pFonts[0]->setFonts( m_families ); m_pFonts[1]->setFonts( m_families ); diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 88e9685bb..b72caa544 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -109,7 +109,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this ); m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); - TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change " + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index 19a647cbd..9322aad42 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -221,7 +221,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="buddy" stdset="0"> diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index 188b0c910..e93084af1 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.tqat(keytabCombo->currentItem())); - co->writeEntry("Schema",*schemaFilename.tqat(schemaCombo->currentItem())); + co->writeEntry("KeyTab",*keytabFilename.at(keytabCombo->currentItem())); + co->writeEntry("Schema",*schemaFilename.at(schemaCombo->currentItem())); co->sync(); delete co; sesMod=false; diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 5396d9e2b..612c2246a 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -720,7 +720,7 @@ TQString KTheme::getProperty( TQDomElement parent, const TQString & tag, else { kdWarning() << TQString( "No such property found: %1->%2->%3" ) - .tqarg( parent.tagName() ).tqarg( tag ).tqarg( attr ) << endl; + .arg( parent.tagName() ).arg( tag ).arg( attr ) << endl; return TQString::null; } } diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 3e60ea4f6..bd63be8a2 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -109,7 +109,7 @@ <property name="frameShape"> <enum>Box</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui index 1a56915aa..e84f1efa8 100644 --- a/kcontrol/kthememanager/newthemewidget.ui +++ b/kcontrol/kthememanager/newthemewidget.ui @@ -88,7 +88,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 52031f6fa..baa127e2f 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.findIndex( code ); if ( oldPos != -1 ) - languageList.remove( languageList.tqat(oldPos) ); + languageList.remove( languageList.at(oldPos) ); if ( oldPos != -1 && oldPos < pos ) --pos; - TQStringList::Iterator it = languageList.tqat( pos ); + TQStringList::Iterator it = languageList.at( 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.tqat( pos ); + TQStringList::Iterator it = languageList.at( 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.tqat( pos - 1 ); - TQStringList::Iterator it2 = languageList.tqat( pos ); + TQStringList::Iterator it1 = languageList.at( pos - 1 ); + TQStringList::Iterator it2 = languageList.at( 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.tqat( pos ); - TQStringList::Iterator it2 = languageList.tqat( pos + 1 ); + TQStringList::Iterator it1 = languageList.at( pos ); + TQStringList::Iterator it2 = languageList.at( pos + 1 ); if ( it1 != languageList.end() && it2 != languageList.end() ) { diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 35530be23..1530fda69 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -157,7 +157,7 @@ void KLocaleConfigMoney::save() if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", TQString::fromLatin1("$0%1$0") - .tqarg(m_locale->monetaryThousandsSeparator()), + .arg(m_locale->monetaryThousandsSeparator()), true, true); i = ent.readNumEntry("FracDigits", 2); diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 6a03129e4..f6149d6d1 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -109,7 +109,7 @@ void KLocaleConfigNumber::save() if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", TQString::fromLatin1("$0%1$0") - .tqarg(m_locale->thousandsSeparator()), true, true); + .arg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); config->deleteEntry("PositiveSign", false, true); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 57e5d7f56..4ed4c263c 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.tqat( pos ); + TQChar c = userFormat.at( 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.tqat(pos); + TQChar c = storeFormat.at(pos); if ( escaped ) { StringPair it = StringPair::find( list, c ); @@ -323,7 +323,7 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem) TQString calendarType; bool ok; - calendarType = calendars.tqat(calendarSystem, &ok); + calendarType = calendars.at(calendarSystem, &ok); if ( !ok ) calendarType = calendars.first(); diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index d5087cc35..c32073243 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -93,7 +93,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis m_screenSelector = new KComboBox(screenBox); for (int s = 0; s < numScreens(); s++) { - m_screenSelector->insertItem(i18n("Screen %1").tqarg(s+1)); + m_screenSelector->insertItem(i18n("Screen %1").arg(s+1)); } m_screenSelector->setCurrentItem(currentScreenIndex()); @@ -172,7 +172,7 @@ void KRandRModule::slotScreenChanged(int screen) // Add new resolutions for (int i = 0; i < currentScreen()->numSizes(); i++) { - m_sizeCombo->insertItem(i18n("%1 x %2").tqarg(currentScreen()->pixelSize(i).width()).tqarg(currentScreen()->pixelSize(i).height())); + m_sizeCombo->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(i).width()).arg(currentScreen()->pixelSize(i).height())); // Aspect ratio /* , aspect ratio %5)*/ diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index f9ded1088..0fc10f235 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -205,7 +205,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu) /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); menu->setItemEnabled(lastIndex, false);*/ } else { - KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").tqarg(s+1).latin1()); + KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); m_screenPopups.append(subMenu); populateMenu(subMenu); lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 50dacf843..c3c154951 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.tqat(mSelected)->setup().isEmpty()); + mSetupBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty()); mTestBt->setEnabled(true); } @@ -587,7 +587,7 @@ void KScreenSaver::slotPreviewExited(KProcess *) if (mSelected >= 0) { mPreviewProc->clearArguments(); - TQString saver = mSaverList.tqat(mSelected)->saver(); + TQString saver = mSaverList.at(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.tqat(indx)->setup().isEmpty()); + mSetupBt->setEnabled(!mSaverList.at(indx)->setup().isEmpty()); mTestBt->setEnabled(true); - mSaver = mSaverList.tqat(indx)->file(); + mSaver = mSaverList.at(indx)->file(); mSelected = indx; setMonitor(); @@ -690,7 +690,7 @@ void KScreenSaver::slotSetup() mSetupProc->clearArguments(); - TQString saver = mSaverList.tqat(mSelected)->setup(); + TQString saver = mSaverList.at(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.tqat(mSelected)->name(); + word = mSaverList.at(mSelected)->name(); (*mSetupProc) << word; word = "-icon"; (*mSetupProc) << word; @@ -724,7 +724,7 @@ void KScreenSaver::slotSetup() // Pass translated name to kxsconfig if (kxsconfig) { - word = mSaverList.tqat(mSelected)->name(); + word = mSaverList.at(mSelected)->name(); (*mSetupProc) << word; } @@ -758,7 +758,7 @@ void KScreenSaver::slotTest() } mTestProc->clearArguments(); - TQString saver = mSaverList.tqat(mSelected)->saver(); + TQString saver = mSaverList.at(mSelected)->saver(); TQTextStream ts(&saver, IO_ReadOnly); TQString word; diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index 0fd9084d1..fe8c4fa06 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -23,7 +23,7 @@ <property name="text"> <string><b>Unable to contact the KDE smartcard service.</b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -48,7 +48,7 @@ 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index 64b72d445..2949e87e7 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -250,7 +250,7 @@ <property name="text"> <string>To add new readers you have to modify /etc/readers.conf file and re-start pcscd</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 84e951523..190f0517f 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -96,7 +96,7 @@ void MenuPreview::createPixmaps() void MenuPreview::blendPixmaps() { - // Rebuild pixmaps, and tqrepaint + // Rebuild pixmaps, and repaint if (pixBlended && pixBackground) { if (mode == Blend && pixOverlay) { @@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity ) if ((int)(menuOpacity*100) != opacity) { menuOpacity = opacity/100.0; blendPixmaps(); - tqrepaint( false ); + repaint( false ); } } @@ -130,7 +130,7 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) if (mode != pvm) { mode = pvm; blendPixmaps(); - tqrepaint( false ); + repaint( false ); } } diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index e4cc3e078..466fd9a98 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.tqat(0)); + r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0)); if ( _devnodes.count() > 1 ) - for ( TQStringList::Iterator it = _devnodes.tqat(1); it != _devnodes.end(); ++it ) + for ( TQStringList::Iterator it = _devnodes.at(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/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 01ebb0502..97b29bfd7 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -674,7 +674,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) } if (!wl.isEmpty()) - wl.tqat(0)->setFocus(); + wl.at(0)->setFocus(); i++; @@ -693,104 +693,104 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) if ( type == "int" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toInt(); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" || type == "TQ_UINT32" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUInt(); } else if( type == "long" || type == "long int" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toLong(); } else if( type == "ulong" || type == "unsigned long" || type == "unsigned long int" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toULong(); } else if( type == "short" || type == "short int" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toShort(); } else if( type == "ushort" || type == "unsigned short" || type == "unsigned short int" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUShort(); } else if ( type == "TQ_UINT64" ) { - KLineEdit* e = ( KLineEdit* )wl.tqat( i ); + KLineEdit* e = ( KLineEdit* )wl.at( i ); arg << e->text().toULongLong(); } else if( type == "float" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toFloat(); } else if( type == "double" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toDouble(); } else if( type == "bool" ) { - TQCheckBox* c = (TQCheckBox*)wl.tqat( i ); + TQCheckBox* c = (TQCheckBox*)wl.at( i ); arg << c->isChecked(); } else if( type == "TQCString" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << TQCString( e->text().local8Bit() ); } else if( type == "TQString" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text(); } else if( type == "TQStringList" ) { - KEditListBox* e = (KEditListBox*)wl.tqat( i ); + KEditListBox* e = (KEditListBox*)wl.at( i ); arg << e->items(); } else if( type == "TQValueList<TQCString>" ) { - KEditListBox* e = (KEditListBox*)wl.tqat( i ); + KEditListBox* e = (KEditListBox*)wl.at( i ); for (int i = 0; i < e->count(); i++) arg << TQCString( e->text(i).local8Bit() ); } else if( type == "KURL" ) { - KLineEdit* e = (KLineEdit*)wl.tqat( i ); + KLineEdit* e = (KLineEdit*)wl.at( i ); arg << KURL( e->text() ); } else if( type == "TQColor" ) { - KColorButton* e = (KColorButton*)wl.tqat( i ); + KColorButton* e = (KColorButton*)wl.at( i ); arg << e->color(); } else if( type == "TQSize" ) { - KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i ); + KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i ); arg << TQSize(e->field(1) , e->field(2)) ; } else if( type == "TQPoint" ) { - KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i ); + KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i ); arg << TQPoint(e->field(1) , e->field(2)) ; } else if( type == "TQRect" ) { - KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i ); + KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i ); arg << TQRect(e->field(1) , e->field(2) , e->field(3) , e->field(4)) ; } else if( type == "TQPixmap" ) { - KURLRequester* e= (KURLRequester*)wl.tqat( i ); + KURLRequester* e= (KURLRequester*)wl.at( i ); arg << TQPixmap(e->url()); } else @@ -1053,7 +1053,7 @@ bool KDCOPWindow::demarshal TQCursor r; reply >> r; //theList->insertItem(r, 1); - ret << "Cursor #" + TQString::number(r.tqshape()); + ret << "Cursor #" + TQString::number(r.shape()); } else if (replyType == "TQPixmap") { diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui index f712f087d..b1933f592 100644 --- a/kdepasswd/kcm/main_widget.ui +++ b/kdepasswd/kcm/main_widget.ui @@ -182,7 +182,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -193,7 +193,7 @@ <property name="text"> <string><i>(Click the button to change your image)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp index fc251d664..eebef5609 100644 --- a/kdeprint/kjobviewer/kjobviewer.cpp +++ b/kdeprint/kjobviewer/kjobviewer.cpp @@ -77,7 +77,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e) int choice = menu.exec(mapToGlobal(e->pos())); if (choice != -1) { - KMJobViewer *view = list.tqat(choice); + KMJobViewer *view = list.at(choice); if (view->isVisible()) KWin::activateWindow(view->winId()); else diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index a3f58c2eb..c3979aacb 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -518,11 +518,11 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) { TQScrollView* sv = dynamic_cast<TQScrollView*>( m_pDesktop ); if ( sv ) { - // Qt eats tqrepaint events in this case :-(( + // Qt eats repaint events in this case :-(( sv->viewport()->update(); } m_pDesktop->setErasePixmap(*ep); - m_pDesktop->tqrepaint(); + m_pDesktop->repaint(); static bool root_cleared = false; if( !root_cleared ) { // clear the root window pixmap set by kdm @@ -923,7 +923,7 @@ void KBackgroundManager::setWallpaper(int desk, TQString wallpaper, int mode) void KBackgroundManager::repaintBackground() { if (m_pDesktop) - m_pDesktop->tqrepaint(); + m_pDesktop->repaint(); else TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); } diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 2f6e3831f..842b543ab 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -159,7 +159,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)", "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false); - // Dont tqrepaint on configuration changes during construction + // Dont repaint on configuration changes during construction m_bInit = true; // It's the child widget that gets the focus, not us @@ -1179,7 +1179,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int void KDesktop::removeIcon(const TQString &_url) { - if (_url.tqat(0) != '/') { + if (_url.at(0) != '/') { qDebug("removeIcon with relative path not supported for now"); return; } diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 106affa0b..8018b4082 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -1055,7 +1055,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) KURL desktop_URL = desktopURL(); if (desktop_URL.isLocalFile()) desktopPath = desktop_URL.path(); - // We have new items, so we'll need to tqrepaint in slotCompleted + // We have new items, so we'll need to repaint in slotCompleted m_bNeedRepaint = true; kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl; KFileItemListIterator it(entries); @@ -1198,7 +1198,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries ) } else { - // In case we replace a big icon with a small one, need to tqrepaint. + // In case we replace a big icon with a small one, need to repaint. updateContents(); // Can't do that with m_bNeedRepaint since slotCompleted isn't called m_bNeedRepaint = false; @@ -1305,7 +1305,7 @@ void KDIconView::slotCompleted() if (!m_hasExistingPos) rearrangeIcons(); -// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " tqrepaint:" << m_bNeedRepaint << endl; +// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " repaint:" << m_bNeedRepaint << endl; if ( m_bNeedSave ) { // Done here because we want to align icons only once initially, and each time new icons appear. @@ -1317,7 +1317,7 @@ void KDIconView::slotCompleted() } if ( m_bNeedRepaint ) { - viewport()->tqrepaint(); + viewport()->repaint(); m_bNeedRepaint = false; } } @@ -1471,7 +1471,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) bool isImmutable = KGlobal::config()->isImmutable(); if ( (isColorDrag || isImageDrag) && !isUrlDrag ) { - // Hack to clear the drag tqshape + // Hack to clear the drag shape bool bMovable = itemsMovable(); bool bSignals = signalsBlocked(); setItemsMovable(false); @@ -1519,7 +1519,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) if( adjustedAnyItems ) { // Make sure the viewport isn't unnecessarily resized by now, - // then schedule a tqrepaint to remove any garbage pixels. + // then schedule a repaint to remove any garbage pixels. resizeContents( width(), height() ); viewport()->update(); } @@ -1541,7 +1541,7 @@ void KDIconView::updateWorkArea( const TQRect &wr ) { m_gotIconsArea = true; // now we have it! - if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid tqrepaint/saveIconPosition ... + if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid repaint/saveIconPosition ... TQRect oldArea = iconArea(); setIconArea( wr ); @@ -1593,8 +1593,8 @@ void KDIconView::updateWorkArea( const TQRect &wr ) } } if ( needRepaint ) { - viewport()->tqrepaint( FALSE ); - tqrepaint( FALSE ); + viewport()->repaint( FALSE ); + repaint( FALSE ); saveIconPositions(); } } @@ -1718,7 +1718,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item ) TQRect rect=item->rect(); if (m_bVertAlign) { - kdDebug(1214)<<"moveToFreePosition for vertical tqalignment"<<endl; + kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl; rect.moveTopLeft(TQPoint(spacing(),spacing())); do diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h index 6ceed0b42..129abec07 100644 --- a/kdesktop/kfileividesktop.h +++ b/kdesktop/kfileividesktop.h @@ -91,7 +91,7 @@ class KFileIVIDesktop : public KFileIVI * Builds the shadow. As the algorithm is pretty slow (at pixel level), * This method is triggered only if the configuration has changed. * @param p the painter for drawing the item - * @param align the shadow tqalignment + * @param align the shadow alignment * @param shadowColor the shadow color */ virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor); diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 4999ff067..9d8647693 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -243,7 +243,7 @@ void KRootWm::initConfig() if (s == s_choices[c]) { rightButtonChoice = (menuChoice) c; break; } - // Read configuration for icons tqalignment + // Read configuration for icons alignment if ( m_bDesktopEnabled ) { bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); if ( kapp->authorize( "editable_desktop_icons" ) ) { diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index 7fde778ab..4544ce093 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -405,7 +405,7 @@ <property name="text"> <string>High</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> @@ -527,7 +527,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -568,7 +568,7 @@ <property name="text"> <string>Enter the name of the application you want to run or the URL you want to view</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp index 3d18b8764..634442d09 100644 --- a/kdesu/kdesu/kdesu.cpp +++ b/kdesu/kdesu/kdesu.cpp @@ -178,7 +178,7 @@ static int startApp() TQString file = TQFile::decodeName(args->getOption("f")); if (change_uid && !file.isEmpty()) { - if (file.tqat(0) != '/') + if (file.at(0) != '/') { KStandardDirs dirs; dirs.addKDEDefaults(); diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 52dbdc811..f02ebba5a 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -492,7 +492,7 @@ static int directCommand(KCmdLineArgs *args) filter = TQString::fromLocal8Bit(args->arg(0)); } // copied from KFileDialog::getSaveFileName(), so we can add geometry - bool specialDir = ( startDir.tqat(0) == ':' ); + bool specialDir = ( startDir.at(0) == ':' ); KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true ); if ( !specialDir ) dlg.setSelection( startDir ); diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c index 7a75330b0..b03d96e15 100644 --- a/kdm/kfrontend/kdm_greet.c +++ b/kdm/kfrontend/kdm_greet.c @@ -700,11 +700,11 @@ restore_modifiers( void ) } void -setCursor( Display *mdpy, int window, int tqshape ) +setCursor( Display *mdpy, int window, int shape ) { Cursor xcursor; - if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) { + if ((xcursor = XCreateFontCursor( mdpy, shape ))) { XDefineCursor( mdpy, window, xcursor ); XFreeCursor( mdpy, xcursor ); XFlush( mdpy ); diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h index d68ee8604..df325c28d 100644 --- a/kdm/kfrontend/kdm_greet.h +++ b/kdm/kfrontend/kdm_greet.h @@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy ); void setup_modifiers( struct _XDisplay *mdpy, int numlock ); void restore_modifiers( void ); -void setCursor( struct _XDisplay *mdpy, int window, int tqshape ); +void setCursor( struct _XDisplay *mdpy, int window, int shape ); extern int rfd; /* for select() loops */ diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 3160f0459..88cd53970 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) //setBackgroundOrigin( WindowOrigin ); mBackgroundBrush = backgroundBrush(); setBackgroundMode( NoBackground ); - tqrepaint(); + repaint(); } void KdmClock::showEvent( TQShowEvent * ) { - tqrepaint(); + repaint(); } void KdmClock::timeout() { - tqrepaint(); + repaint(); } void KdmClock::paintEvent( TQPaintEvent * ) diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index d1d2ea32d..05945348a 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -243,8 +243,8 @@ void KGreeter::handleInputPipe(void) { currentDisplay = TQString(getenv("DISPLAY")); currentDisplay = currentDisplay.replace(":", ""); displayNumber = currentDisplay.toInt(); - mPipeFilename = TQString(FIFO_FILE).tqarg(displayNumber); - ::unlink((TQString(FIFO_SAK_FILE).tqarg(displayNumber)).ascii()); + mPipeFilename = TQString(FIFO_FILE).arg(displayNumber); + ::unlink((TQString(FIFO_SAK_FILE).arg(displayNumber)).ascii()); /* Create the FIFOs if they do not exist */ umask(0); @@ -338,12 +338,12 @@ class UserListViewItem : public KListViewItem { parent->cachedSizeHint.setWidth( -1 ); } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if (((UserListView*)listView())->themed) - TQListViewItem::paintCell(p, cg, column, width, tqalignment); + TQListViewItem::paintCell(p, cg, column, width, alignment); else - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } TQString login; @@ -422,7 +422,7 @@ KGreeter::insertUser( const TQImage &default_pix, if ( randomFace.isNull() ) { TQStringList::size_type index = 0; for ( size_t i = 0; i < username.length(); ++i ) - index += ( 0x7f - username.tqat( i ).latin1() ) % 37; + index += ( 0x7f - username.at( i ).latin1() ) % 37; randomFace = randomFaces[ index % randomFaces.count() ]; } p.load( _faceDir + "/../pics/users/" + randomFace + ".png" ); diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp index 390601c8d..7d231948f 100644 --- a/kdm/kfrontend/krootimage.cpp +++ b/kdm/kfrontend/krootimage.cpp @@ -73,7 +73,7 @@ MyApplication::renderDone() // ...set it to the desktop widget... TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm ); - TQT_TQWIDGET(desktop())->tqrepaint( true ); + TQT_TQWIDGET(desktop())->repaint( true ); // ...and export it via Esetroot-style so that composition managers can use it! Pixmap bgPm = pm.handle(); // fetch the actual X handle to it diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc index 2f32522ce..2ad6495b4 100644 --- a/kdm/kfrontend/sakdlg.cc +++ b/kdm/kfrontend/sakdlg.cc @@ -157,8 +157,8 @@ void SAKDlg::handleInputPipe(void) { currentDisplay = TQString(getenv("DISPLAY")); currentDisplay = currentDisplay.replace(":", ""); displayNumber = currentDisplay.toInt(); - mPipeFilename = TQString(FIFO_SAK_FILE).tqarg(displayNumber); - ::unlink((TQString(FIFO_FILE).tqarg(displayNumber)).ascii()); + mPipeFilename = TQString(FIFO_SAK_FILE).arg(displayNumber); + ::unlink((TQString(FIFO_FILE).arg(displayNumber)).ascii()); /* Create the FIFOs if they do not exist */ umask(0); diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 9b066f750..1c859d101 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -280,7 +280,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force ) if (fixedManager && !fixedManager->isEmpty()) fixedManager->update( newGeometry, force ); - // TODO send *selective* tqrepaint signal + // TODO send *selective* repaint signal } void @@ -299,7 +299,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Software blend only (no compositing support) TQPixmap copy( myWidget->size() ); - kdDebug() << myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl; + kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl; bitBlt( ©, TQPoint( 0, 0), p->device(), myWidget->geometry(), TQt::CopyROP ); // Lighten it slightly TQImage lightVersion; @@ -592,7 +592,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) } else { // int value dType = DTpixel; TQString sCopy = s; - if (sCopy.tqat( 0 ) == '-') { + if (sCopy.at( 0 ) == '-') { sCopy.remove( 0, 1 ); dType = DTnpixel; } @@ -616,7 +616,7 @@ KdmItem::parseFont( const TQString &s, TQFont &font ) void KdmItem::parseColor( const TQString &s, TQColor &color ) { - if (s.tqat( 0 ) != '#') + if (s.at( 0 ) != '#') return; bool ok; TQString sCopy = s; diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index c76222914..230ed71c4 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -96,7 +96,7 @@ public: /** * Fixup the geometry of an item and its children (even if fixed - * or boxed ones). Note that this will generate tqrepaint signals + * or boxed ones). Note that this will generate repaint signals * when needed. The default implementation should fit all needs. */ virtual void setGeometry( const TQRect &newGeometry, bool force ); @@ -109,7 +109,7 @@ public: void paint( TQPainter *painter, const TQRect &boundaries ); /** - * Update representation of contents and tqrepaint. + * Update representation of contents and repaint. */ virtual void update(); @@ -195,7 +195,7 @@ protected: /** * Called when item changes its 'state' variable. This must - * handle item's tqrepaint. + * handle item's repaint. */ virtual void statusChanged(); diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index b110adf78..4959bec7b 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -116,7 +116,7 @@ KdmLabel::setTextInt( const TQString &txt) if (cAccel != -1) { cText.remove('&'); myAccel = new TQAccel(parentWidget()); - myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode()); + myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().tqunicode()); connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); } } @@ -177,8 +177,8 @@ KdmLabel::drawContents( TQPainter *p, const TQRect &/*r*/ ) TQFont f(l->font); f.setUnderline(true); p->setFont ( f ); - p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.tqat(cAccel))); - tarea.rLeft() += fm.width(cText.tqat(cAccel)); + p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.at(cAccel))); + tarea.rLeft() += fm.width(cText.at(cAccel)); p->setFont( l->font ); p->drawText( tarea, AlignLeft | SingleLine, right); } else { diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index c11ae8426..8020bd1e1 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -138,7 +138,7 @@ KdmPixmap::fullPath( const TQString &fileName) return TQString::null; TQString fullName = fileName; - if (fullName.tqat( 0 ) != '/') + if (fullName.at( 0 ) != '/') fullName = baseDir() + "/" + fileName; return fullName; } @@ -177,7 +177,7 @@ KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass ) TQString ext = fullpath.right(fullpath.length() - index); fullpath = fullpath.left(index); kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl; - TQString testpath = TQString("-%1x%2").tqarg(area.width()).arg(area.height()) + ext; + TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext; kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl; if (KStandardDirs::exists(fullpath + testpath)) pClass->pixmap.load(fullpath + testpath); diff --git a/kdmlib/kdmtsak.cpp b/kdmlib/kdmtsak.cpp index cb3c5b3b2..22f8a0b9a 100644 --- a/kdmlib/kdmtsak.cpp +++ b/kdmlib/kdmtsak.cpp @@ -76,7 +76,7 @@ bool is_vt_active() { if (intFound == false) { return true; } - curConsole = TQString("vt%1").tqarg(curConsoleNum);; + curConsole = TQString("vt%1").arg(curConsoleNum);; TQStringList sessionList = TQStringList::split('\t', output, false); for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) { TQStringList sessionInfoList = TQStringList::split(',', *it, true); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 56218d4fb..a6e91362f 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -293,7 +293,7 @@ void KfindWindow::deleteFiles() // Iterate on all selected elements TQPtrList<TQListViewItem> selected = selectedItems(); for ( uint i = 0; i < selected.count(); i++ ) { - KfFileLVI *item = (KfFileLVI *) selected.tqat(i); + KfFileLVI *item = (KfFileLVI *) selected.at(i); KFileItem file = item->fileitem; KIO::NetAccess::del(file.url(), this); @@ -335,7 +335,7 @@ void KfindWindow::resizeEvent(TQResizeEvent *e) { KListView::resizeEvent(e); resetColumns(false); - clipper()->tqrepaint(); + clipper()->repaint(); } TQDragObject * KfindWindow::dragObject() @@ -346,7 +346,7 @@ TQDragObject * KfindWindow::dragObject() // create a list of URIs from selection for ( uint i = 0; i < selected.count(); i++ ) { - KfFileLVI *item = (KfFileLVI *) selected.tqat( i ); + KfFileLVI *item = (KfFileLVI *) selected.at( i ); if (item) { uris.append( item->fileitem.url() ); diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index 5b741bdf5..716c4d99e 100644 --- a/khelpcenter/docentry.cpp +++ b/khelpcenter/docentry.cpp @@ -278,7 +278,7 @@ void DocEntry::addChild( DocEntry *entry ) entry->weight() < mChildren[ i + 1 ]->weight() ) { entry->setNextSibling( mChildren[ i + 1 ] ); mChildren[ i ]->setNextSibling( entry ); - mChildren.insert( mChildren.tqat( i + 1 ), entry ); + mChildren.insert( mChildren.at( i + 1 ), entry ); break; } } diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index e8065cd8e..da07c3c0e 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -93,7 +93,7 @@ void History::createEntry() Entry * current = m_entries.current(); if (current) { - m_entries.tqat( m_entries.count() - 1 ); // go to last one + m_entries.at( m_entries.count() - 1 ); // go to last one for ( ; m_entries.current() != current ; ) { if ( !m_entries.removeLast() ) { // and remove from the end (faster and easier) @@ -101,7 +101,7 @@ void History::createEntry() return; } else - m_entries.tqat( m_entries.count() - 1 ); + m_entries.at( m_entries.count() - 1 ); } // Now current is the current again. @@ -111,7 +111,7 @@ void History::createEntry() // Append a new entry m_entries.append( new Entry ); // made current - Q_ASSERT( m_entries.tqat() == (int) m_entries.count() - 1 ); + Q_ASSERT( m_entries.at() == (int) m_entries.count() - 1 ); } void History::updateCurrentEntry( View *view ) @@ -199,9 +199,9 @@ void History::goHistory( int steps ) Entry *current = m_entries.current(); if ( current && !current->view ) m_entries.remove(); - int newPos = m_entries.tqat() + steps; + int newPos = m_entries.at() + steps; - current = m_entries.tqat( newPos ); + current = m_entries.at( newPos ); if ( !current ) { kdError() << "No History entry at position " << newPos << endl; return; @@ -276,14 +276,14 @@ void History::fillGoMenu() // Second case: big history, in one or both directions { // Assume both directions first (in this case we place the current URL in the middle) - m_goMenuHistoryStartPos = m_entries.tqat() + 4; + m_goMenuHistoryStartPos = m_entries.at() + 4; // Forward not big enough ? - if ( m_entries.tqat() > (int)m_entries.count() - 4 ) + if ( m_entries.at() > (int)m_entries.count() - 4 ) m_goMenuHistoryStartPos = m_entries.count() - 1; } Q_ASSERT( m_goMenuHistoryStartPos >= 0 && (uint)m_goMenuHistoryStartPos < m_entries.count() ); - m_goMenuHistoryCurrentPos = m_entries.tqat(); // for slotActivated + m_goMenuHistoryCurrentPos = m_entries.at(); // for slotActivated fillHistoryPopup( goMenu, false, false, true, m_goMenuHistoryStartPos ); } @@ -314,7 +314,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw TQPtrListIterator<Entry> it( m_entries ); if (onlyBack || onlyForward) { - it += m_entries.tqat(); // Jump to current item + it += m_entries.at(); // Jump to current item if ( !onlyForward ) --it; else ++it; // And move off it } else if ( startPos ) it += startPos; // Jump to specified start pos @@ -339,12 +339,12 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw bool History::canGoBack() const { - return m_entries.tqat() > 0; + return m_entries.at() > 0; } bool History::canGoForward() const { - return m_entries.tqat() != static_cast<int>( m_entries.count() ) - 1; + return m_entries.at() != static_cast<int>( m_entries.count() ) - 1; } #include "history.moc" diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index 5f93c39fd..c47300190 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -28,7 +28,7 @@ TQString HTMLSearch::dataPath(const TQString& _lang) void HTMLSearch::scanDir(const TQString& dir) { - assert( dir.tqat( dir.length() - 1 ) == '/' ); + assert( dir.at( dir.length() - 1 ) == '/' ); TQStringList::ConstIterator it; @@ -83,7 +83,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang) TQStringList add = config->readListEntry("Paths"); TQStringList::Iterator it; for (it = add.begin(); it != add.end(); ++it) { - if ( ( *it ).tqat( ( *it ).length() - 1 ) != '/' ) + if ( ( *it ).at( ( *it ).length() - 1 ) != '/' ) ( *it ) += '/'; dirs.append(*it); } diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index 7d367f1be..b3c70915c 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -83,7 +83,7 @@ void KTagComboBox::internalActivate( int index ) if (current == index) return; current = index; emit activated( index ); - tqrepaint(); + repaint(); } void KTagComboBox::internalHighlight( int index ) @@ -211,7 +211,7 @@ bool KTagComboBox::containsTag( const TQString &str ) const TQString KTagComboBox::currentTag() const { - return *tags->tqat(currentItem()); + return *tags->at(currentItem()); } TQString KTagComboBox::tag(int i) const @@ -221,7 +221,7 @@ TQString KTagComboBox::tag(int i) const kdDebug() << "KTagComboBox::tag(), unknown tag " << i << endl; return TQString::null; } - return *tags->tqat(i); + return *tags->at(i); } int KTagComboBox::currentItem() const @@ -233,7 +233,7 @@ void KTagComboBox::setCurrentItem(int i) { if (i < 0 || i >= count()) return; current = i; - tqrepaint(); + repaint(); } void KTagComboBox::setCurrentItem(const TQString &code) diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index e357abe2a..7bda95b8c 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -164,7 +164,7 @@ void TOC::meinprocExited( KProcess *meinproc ) TQDomComment timestamp = doc.createComment( TQString::number( sourceFileCTime() ) ); doc.documentElement().appendChild( timestamp ); - f.tqat( 0 ); + f.at( 0 ); TQTextStream stream( &f ); stream.setEncoding( TQTextStream::UnicodeUTF8 ); stream << doc.toString(); diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index c05d73945..2364e6e51 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -33,7 +33,7 @@ void GestureDrawer::setData(const TQString &data) { _data = data; - tqrepaint(); + repaint(); } void GestureDrawer::paintEvent(TQPaintEvent *ev) diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index e082fd6c8..2aeaee5c6 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -33,7 +33,7 @@ <string><p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index 6029f0522..f80ebae1b 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -23,7 +23,7 @@ <property name="text"> <string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 190b5dd04..f9bfec6d3 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -55,7 +55,7 @@ Kbd::~Kbd() void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); if( rcv.active ) grab_shortcut( shortcut_P ); @@ -63,17 +63,17 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - tqreceivers.remove( receiver_P ); + receivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( rcv.active ) return; rcv.active = true; @@ -85,7 +85,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P ) void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -144,8 +144,8 @@ void Kbd::key_slot( TQString key_P ) KShortcut shortcut( key_P ); if( !grabs.contains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); - it != tqreceivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); + it != receivers.end(); ++it ) if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index a9f19240d..f74368944 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -58,7 +58,7 @@ class Kbd TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > tqreceivers; + TQMap< Kbd_receiver*, Receiver_data > receivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index 5b99a1cba..393b02f46 100644 --- a/khotkeys/shared/sound.cpp +++ b/khotkeys/shared/sound.cpp @@ -93,7 +93,7 @@ void Sound::load(const TQString& filename) TQ_INT32 nb=0; for(uint k=0;k<BytePS;k++) { - nb |= (SoundData.tqat(f*BytePS+k)&0x000000FF) << (k*8); + nb |= (SoundData.at(f*BytePS+k)&0x000000FF) << (k*8); } if(nb & (1 << (BytePS*8 -1)) ) nb = nb-(1<<BytePS*8); @@ -129,11 +129,11 @@ void Sound::save(const TQString& filename) const for(unsigned long int f=0;f<data.size();f++) { - TQ_UINT16 val= (signed short int) ( (data.tqat(f) * ((double)(1<<13)/(signed)max) ) ); - SoundData.tqat( 2*f )= val & 0x00FF; - SoundData.tqat(2*f+1)= (val & 0xFF00) >> 8; + TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + SoundData.at( 2*f )= val & 0x00FF; + SoundData.at(2*f+1)= (val & 0xFF00) >> 8; -// kdDebug( 1217 ) << k_funcinfo << data.tqat(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; +// kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } TQ_UINT16 NumberOfChannels=2; diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 9dca03a99..6453563de 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -42,7 +42,7 @@ public: inline float at(int pos) const { - return (float)(data.tqat(pos))/max; + return (float)(data.at(pos))/max; } inline uint fs() const diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index b40c8fd6a..8ef817933 100644 --- a/khotkeys/shared/voicesignature.cpp +++ b/khotkeys/shared/voicesignature.cpp @@ -210,7 +210,7 @@ TQMemArray<double> VoiceSignature::fft(const Sound& sound, unsigned int start, u for(uint x=start; x<stop; x++) { - Complex s(sound.tqat(x)); + Complex s(sound.at(x)); double angle=-2*PI*f*x/8000; s*= Complex( cos(angle) , sin(angle) ); c+=s; diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 6c4bb7175..772ea1601 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -827,7 +827,7 @@ void FuzzyClock::drawContents(TQPainter *p) } if (phStart >= 0) newTimeStr.replace(phStart, phLength, hourNames[realHour]); - newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper())); + newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -1020,7 +1020,7 @@ int ClockApplet::widthForHeight(int h) const // if the date format STARTS with a year, assume it's in descending // order and should therefore PRECEED the date. TQString dateFormat = KGlobal::locale()->dateFormatShort(); - dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y'; + dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y'; } if (dateFirst) @@ -1272,7 +1272,7 @@ void ClockApplet::reconfigure() _clock->widget()->installEventFilter(this); // catch mouse clicks _clock->widget()->show(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ if (showDayOfWeek) { @@ -1623,7 +1623,7 @@ void ClockApplet::showZone(int z) zone->setZone(z); TZoffset = zone->calc_TZ_offset( zone->zone() ); updateDateLabel(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ } void ClockApplet::nextZone() diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index 2aaffe781..edfa6f02f 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -152,7 +152,7 @@ <property name="text"> <string>Short Term</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -163,7 +163,7 @@ <property name="text"> <string>Long Term</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index db49642cc..30b125726 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -1097,7 +1097,7 @@ void QuickLauncher::updateStickyHighlightLayer() } } } - tqrepaint(); + repaint(); } void QuickLauncher::paintEvent(TQPaintEvent* e) diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 6975af0c0..cc47d17cb 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(), + m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { @@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged() { TQString name = m_kwin->desktopName(i); (*it)->setDesktopName(name); - (*it)->tqrepaint(); + (*it)->repaint(); TQToolTip::remove((*it)); TQToolTip::add((*it), name); } diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index e408cf6aa..4e2d5aa9e 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const TQRect r = mapGeometryToViewport(*info); if (!info->hasState(NET::Sticky) && - !TQApplication::desktop()->tqgeometry().contains(r.topLeft()) && - !TQApplication::desktop()->tqgeometry().contains(r.topRight())) + !TQApplication::desktop()->geometry().contains(r.topLeft()) && + !TQApplication::desktop()->geometry().contains(r.topRight())) return false; } diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index b1dde4221..191657e75 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -388,7 +388,7 @@ void SystemTrayApplet::checkAutoRetract() return; } - if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos()))) + if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 8493426ff..bba5e686e 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) it != containers.constEnd(); ++it, ++i) { - if ((*it)->tqgeometry().contains(p)) + if ((*it)->geometry().contains(p)) { return i; } @@ -350,7 +350,7 @@ void DockBarExtension::mousePressEvent(TQMouseEvent *e ) { mclic_pos = e->pos(); } else if (e->button() == Qt::RightButton) { int pos = findContainerAtPoint(e->pos()); - if (pos != -1) containers.tqat(pos)->popupMenu(e->globalPos()); + if (pos != -1) containers.at(pos)->popupMenu(e->globalPos()); } } @@ -374,7 +374,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { int pos = findContainerAtPoint(e->pos()); original_container = 0; if (pos > -1) { - original_container = containers.tqat(pos); + original_container = containers.at(pos); mclic_dock_pos = e->pos() - original_container->pos(); dragged_container_original_pos = pos; dragging_container = new DockContainer(original_container->command(), 0, original_container->resName(), original_container->resClass(), true); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 6ebb6b05c..89fcad751 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -255,7 +255,7 @@ void KasBar::setTint( bool enable ) } emit configChanged(); - tqrepaint( true ); + repaint( true ); } } @@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color ) emit configChanged(); if ( rootPix->isAvailable() ) - rootPix->tqrepaint( true ); + rootPix->repaint( true ); } } @@ -451,24 +451,24 @@ void KasBar::updateLayout() KasItem *i; if ( orient == Qt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { - int x = (items.tqat() % c) * itemExtent(); + int x = (items.at() % c) * itemExtent(); if ( direction_ == TQBoxLayout::RightToLeft ) x = width() - x - itemExtent(); - i->setPos( x, (items.tqat() / c) * itemExtent() ); + i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { for ( i = items.first(); i; i = items.next() ) { - int y = (items.tqat() / r) * itemExtent(); + int y = (items.at() / r) * itemExtent(); if ( direction_ == TQBoxLayout::BottomToTop ) y = height() - y - itemExtent(); - i->setPos( (items.tqat() % r) * itemExtent(), y ); + i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } @@ -658,7 +658,7 @@ void KasBar::repaintItem(KasItem *i, bool erase ) paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } KasItem* KasBar::itemAt(const TQPoint &p) diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index c9a3ddd52..342da3743 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -120,7 +120,7 @@ public: void remove( KasItem *i ); void clear(); KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); } - KasItem *itemAt( uint i ) { return items.tqat( i ); } + KasItem *itemAt( uint i ) { return items.at( i ); } int indexOf( KasItem *i ) { return items.find( i ); } KasItemList *itemList() { return &items; } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index cedc49a67..c0a55753a 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -141,7 +141,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - tqrepaint( true ); + repaint( true ); } TQSize KasBarExtension::detachedSize() diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index fe5f02ef6..12058a3c7 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -213,7 +213,7 @@ void KasGroupItem::paint( TQPainter *p ) int ypos = 16; for ( int i = 0; ( i < (int) items.count() ) && ( i < microsPerCol ); i++ ) { - Task::Ptr t = items.tqat( i ); + Task::Ptr t = items.at( i ); if( t->isIconified() ) p->drawPixmap( xpos, ypos, res->microMinIcon() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h index ec6f07493..e30260f57 100644 --- a/kicker/extensions/kasbar/kasgroupitem.h +++ b/kicker/extensions/kasbar/kasgroupitem.h @@ -91,7 +91,7 @@ public: KasTasker *kasbar() const; - Task::Ptr task( uint i ) { return items.tqat( i ); } + Task::Ptr task( uint i ) { return items.at( i ); } int taskCount() const { return items.count(); } TQPixmap icon(); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index a1b3f55fc..323148713 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -547,12 +547,12 @@ void KasItem::paint( TQPainter *p, int x, int y ) p->restore(); } -void KasItem::tqrepaint() +void KasItem::repaint() { - tqrepaint( true ); + repaint( true ); } -void KasItem::tqrepaint( bool erase ) +void KasItem::repaint( bool erase ) { if ( kas->isVisible() ) kas->repaintItem( this, erase ); diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 7fd0875d0..5c7378825 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -171,8 +171,8 @@ public: void paintModified( TQPainter *p ); public slots: - void tqrepaint(); - void tqrepaint( bool erase ); + void repaint(); + void repaint( bool erase ); void update(); void setActive( bool yes ); diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 20374addd..8b6714cad 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -135,7 +135,7 @@ TQPixmap KasTaskItem::icon() TQPixmap thumb = task_->thumbnail(); TQSize sz = thumb.size(); - sz.tqscale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); + sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); TQImage img = thumb.convertToImage(); img = img.smoothScale( sz ); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 24e37b505..1394823e3 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme() } else { - m_rootPixmap->tqrepaint(true); + m_rootPixmap->repaint(true); } double tint = double(KickerSettings::tintValue()) / 100; diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 2b5153545..a05027628 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -286,7 +286,7 @@ void KNewButton::drawEye() } m_active_pixmap = pixmap.xForm(matrix); - tqrepaint(false); + repaint(false); } #undef eye_x #undef eye_y diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 6b03269eb..26f90b116 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover() { if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || - m_applet->tqgeometry().contains(m_applet->mapToParent( + m_applet->geometry().contains(m_applet->mapToParent( m_applet->mapFromGlobal(TQCursor::pos())))) { return; diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 47a07a5f5..5fc276d44 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _valid = true; _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); - _applet->setAlignment((KPanelApplet::Alignment)tqalignment()); + _applet->setAlignment((KPanelApplet::Alignment)alignment()); _actions = _applet->actions(); _type = _applet->type(); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 0b1ff30f7..183ceb0f2 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -38,7 +38,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Qt::Horizontal) - , _tqalignment(KPanelExtension::LeftTop) + , _alignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -112,12 +112,12 @@ void BaseContainer::slotRemoved(KConfig* config) void BaseContainer::setAlignment(KPanelExtension::Alignment a) { - if (_tqalignment == a) + if (_alignment == a) { return; } - _tqalignment = a; + _alignment = a; alignmentChange(a); } diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 0c4a79539..f1eaddee1 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -73,7 +73,7 @@ public: KPanelApplet::Direction popupDirection() const { return _dir; } KPanelExtension::Orientation orientation() const { return _orient; } - KPanelExtension::Alignment tqalignment() const { return _tqalignment; } + KPanelExtension::Alignment alignment() const { return _alignment; } virtual void setBackground() {} @@ -118,7 +118,7 @@ protected: KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; - KPanelExtension::Alignment _tqalignment; + KPanelExtension::Alignment _alignment; double _fspace; TQPoint _moveOffset; TQString _aid; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index eface400a..20bac8bbd 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -315,7 +315,7 @@ void ExtensionContainer::readConfig() } positionChange(position()); - alignmentChange(tqalignment()); + alignmentChange(alignment()); setSize(static_cast<KPanelExtension::Size>(m_settings.size()), m_settings.customSize()); @@ -523,7 +523,7 @@ void ExtensionContainer::moveMe() } UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor); - arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen); + arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen); _is_lmb_down = false; @@ -788,7 +788,7 @@ void ExtensionContainer::autoHide(bool hide) blockUserInput(true); TQPoint oldpos = pos(); - TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden ); + TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); TQPoint newpos = newextent.topLeft(); if (hide) @@ -900,7 +900,7 @@ void ExtensionContainer::animatedHide(bool left) } TQPoint oldpos = pos(); - TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState); + TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) @@ -987,7 +987,7 @@ bool ExtensionContainer::reserveStrut() const return !m_extension || m_extension->reserveStrut(); } -KPanelExtension::Alignment ExtensionContainer::tqalignment() const +KPanelExtension::Alignment ExtensionContainer::alignment() const { // KConfigXT really needs to get support for vars that are enums that // are defined in other classes @@ -1005,7 +1005,7 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen()); + TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); TQRect virtRect(TQApplication::desktop()->geometry()); TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); @@ -1590,7 +1590,7 @@ KPanelExtension::Position ExtensionContainer::position() const void ExtensionContainer::resetLayout() { - TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); // Disable the layout while we rearrange the panel. @@ -1997,12 +1997,12 @@ void ExtensionContainer::setXineramaScreen(int screen) return; } - arrange(position(),tqalignment(), screen); + arrange(position(),alignment(), screen); } TQRect ExtensionContainer::currentGeometry() const { - return initialGeometry(position(), tqalignment(), xineramaScreen(), + return initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); } diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index c6347ba08..724ba0a10 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -86,7 +86,7 @@ public: KPanelExtension::Orientation orientation() const; KPanelExtension::Position position() const; - void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); } + void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); } int xineramaScreen() const; void setXineramaScreen(int screen); @@ -100,7 +100,7 @@ public: void unhideIfHidden(int showForHowManyMS = 0); bool reserveStrut() const; - KPanelExtension::Alignment tqalignment() const; + KPanelExtension::Alignment alignment() const; void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 20f6720d7..3651e1a93 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -1441,7 +1441,7 @@ void ContainerArea::setBackground() } else { - _rootPixmap->tqrepaint(true); + _rootPixmap->repaint(true); } double tint = double(KickerSettings::tintValue()) / 100; @@ -1725,7 +1725,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p) setBackground(); // container extension repaints for us! - //tqrepaint(); + //repaint(); } void ContainerArea::setAlignment(KPanelExtension::Alignment a) @@ -1900,9 +1900,9 @@ TQStringList ContainerArea::listContainers() const return m_layout->listItems(); } -void ContainerArea::tqrepaint() +void ContainerArea::repaint() { - Panner::tqrepaint(); + Panner::repaint(); } void ContainerArea::showAddAppletDialog() diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index 8b473124e..54bbf6f48 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -103,7 +103,7 @@ public slots: void setPosition(KPanelExtension::Position p); void setAlignment(KPanelExtension::Alignment a); void slotSaveContainerConfig(); - void tqrepaint(); + void repaint(); void showAddAppletDialog(); void addAppletDialogDone(); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index dc325597b..68d0aafa4 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -43,7 +43,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator TQLayoutItem* current() { - return m_idx < int(m_list->count()) ? (*m_list->tqat(m_idx))->item : 0; + return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0; } TQLayoutItem* next() @@ -55,7 +55,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator TQLayoutItem* takeCurrent() { TQLayoutItem* item = 0; - ContainerAreaLayout::ItemList::iterator b = m_list->tqat(m_idx); + ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); if (b != m_list->end()) { ContainerAreaLayoutItem* layoutItem = *b; @@ -223,7 +223,7 @@ int ContainerAreaLayout::count() const { \reimp */ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.tqat(index))->item : 0; + return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; } /*! @@ -232,8 +232,8 @@ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { TQLayoutItem* ContainerAreaLayout::takeAt(int index) { if (index < 0 || index >= m_items.count()) return 0; - ContainerAreaLayoutItem *b = *m_items.tqat(index); - m_items.remove(m_items.tqat(index)); + ContainerAreaLayoutItem *b = *m_items.at(index); + m_items.remove(m_items.at(index)); TQLayoutItem *item = b->item; b->item = 0; delete b; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index b7a1816e0..e0f68ce8a 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens return; } - TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), extension->xineramaScreen()); // reduce given area (TQRect) to the space not covered by the given extension diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 0e9533e08..564a6d980 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -43,17 +43,17 @@ class UserRectSel : public TQWidget PanelStrut() : m_screen(-1), m_pos(KPanelExtension::Bottom), - m_tqalignment(KPanelExtension::LeftTop) + m_alignment(KPanelExtension::LeftTop) { } PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, - KPanelExtension::Alignment tqalignment) + KPanelExtension::Alignment alignment) : m_rect(rect), m_screen(XineramaScreen), m_pos(pos), - m_tqalignment(tqalignment) + m_alignment(alignment) { } @@ -61,7 +61,7 @@ class UserRectSel : public TQWidget { return m_screen == rhs.m_screen && m_pos == rhs.m_pos && - m_tqalignment == rhs.m_tqalignment; + m_alignment == rhs.m_alignment; } bool operator!=(const PanelStrut& rhs) @@ -72,7 +72,7 @@ class UserRectSel : public TQWidget TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; - KPanelExtension::Alignment m_tqalignment; + KPanelExtension::Alignment m_alignment; }; typedef TQValueVector<PanelStrut> RectList; diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 294be2463..e5fa5672c 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -225,7 +225,7 @@ void AddAppletVisualFeedback::swoopCloser() void AddAppletVisualFeedback::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } #include "addappletvisualfeedback.moc" diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui index 7ddb827b4..46e62b342 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -65,7 +65,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -117,7 +117,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index f784a9ca2..e0e162d33 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -52,7 +52,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : i18n("&Move %1 Button")) : i18n("&Move %1"); - insertItem(SmallIcon("move"), text.tqarg(titleText), Move); + insertItem(SmallIcon("move"), text.arg(titleText), Move); // we look for a container area to see if we can add containers // this is part of the kiosk support in kicker, allowing @@ -76,7 +76,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP text = isButton ? (isMenu ? i18n("&Remove %1 Menu") : i18n("&Remove %1 Button")) : i18n("&Remove %1"); - insertItem(SmallIcon("remove"), text.tqarg(titleText), Remove); + insertItem(SmallIcon("remove"), text.arg(titleText), Remove); needSeparator = true; } } @@ -103,7 +103,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP KIcon::Small, 0, KIcon::DefaultState, 0, true)); - insertItem(iconPix, i18n("&About %1").tqarg( titleText ), About); + insertItem(iconPix, i18n("&About %1").arg( titleText ), About); needSeparator = !(actions & KPanelApplet::Help); } @@ -123,12 +123,12 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP if (isButton) { insertItem(SmallIcon("configure"), - i18n("&Configure %1 Button...").tqarg(titleText), Preferences); + i18n("&Configure %1 Button...").arg(titleText), Preferences); } else { insertItem(SmallIcon("configure"), - i18n("&Configure %1...").tqarg(titleText), Preferences); + i18n("&Configure %1...").arg(titleText), Preferences); } needSeparator = true; } diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp index debe91d3e..68e5befe4 100644 --- a/kicker/kicker/ui/clicklineedit.cpp +++ b/kicker/kicker/ui/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - tqrepaint(); + repaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index deaae70b9..959726bfa 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -59,7 +59,7 @@ void KickerClientMenu::insertItem( TQString text, int id ) TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id ) { TQString subname("%1-submenu%2"); - TQCString subid = subname.tqarg(static_cast<const char *>(objId())).tqarg(id).local8Bit(); + TQCString subid = subname.arg(static_cast<const char *>(objId())).arg(id).local8Bit(); KickerClientMenu *sub = new KickerClientMenu(this, subid); int globalid = TQPopupMenu::insertItem( icon, text, sub, id); setItemParameter( globalid, id ); diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp index 582c44b46..a30434a48 100644 --- a/kicker/kicker/ui/extensionop_mnu.cpp +++ b/kicker/kicker/ui/extensionop_mnu.cpp @@ -59,7 +59,7 @@ PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int action if (!Kicker::the()->isImmutable() && (actions & KPanelExtension::Preferences)) { insertSeparator(); - insertItem(SmallIcon("configure"), i18n("&Configure %1...").tqarg(extension), Preferences); + insertItem(SmallIcon("configure"), i18n("&Configure %1...").arg(extension), Preferences); } adjustSize(); diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index 34b3b310f..ae96ebcaa 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -270,7 +270,7 @@ void FlipScrollView::slotScrollTimer() if (!mSelectMenuPath.isEmpty()) { if (mSelectMenuPath=="kicker:/goup/") { currentView()->setSelected(currentView()->firstChild(),true); - currentView()->firstChild()->tqrepaint(); + currentView()->firstChild()->repaint(); } else { TQListViewItem * child = currentView()->firstChild(); @@ -278,8 +278,8 @@ void FlipScrollView::slotScrollTimer() KMenuItem* kitem = dynamic_cast<KMenuItem*>(child); if (kitem && kitem->menuPath()==mSelectMenuPath) { currentView()->setSelected(child,true); - kdDebug() << "child tqrepaint\n"; - child->tqrepaint(); + kdDebug() << "child repaint\n"; + child->repaint(); break; } child = child->nextSibling(); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 77e1dc22c..25263e872 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group) } generateIcons(); - tqrepaint(false); + repaint(false); } void HideButton::enterEvent(TQEvent *e) { m_highlight = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 4ce92358a..6cb94ed56 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -145,7 +145,7 @@ void KMenuItem::setIcon(const TQString& icon, int size) void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - tqrepaint(); + repaint(); } void KMenuItem::setup() @@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int else listview->m_lastOne = static_cast<KMenuItem*>( itemBelow() ); listview->m_old_contentY = -1; - tqrepaint(); + repaint(); } } } @@ -350,7 +350,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column { // the listview caches paint events m_old_width = width; - tqrepaint(); + repaint(); } } @@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); - m_lastOne->tqrepaint(); + m_lastOne->repaint(); } } diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index fc0b62392..31f93c227 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -348,7 +348,7 @@ void PanelKMenu::initialize() if (clients.count() > 0) { TQIntDictIterator<KickerClientMenu> it(clients); while (it){ - if (it.current()->text.tqat(0) != '.') + if (it.current()->text.at(0) != '.') insertItem( it.current()->icon, it.current()->text, @@ -419,10 +419,10 @@ void PanelKMenu::repairDisplay(void) { displayRepairTimer->stop(); // Now do a nasty hack to prevent search bar merging into the side image - // This forces a layout/tqrepaint of the qpopupmenu - tqrepaint(); // This ensures that the side bar image was applied + // This forces a layout/repaint of the qpopupmenu + repaint(); // This ensures that the side bar image was applied styleChange(tqstyle()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. - update(); // This repaints the entire popup menu to apply the widget size/tqalignment changes made above + update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above } } diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index d9de1e37a..2abe63dcf 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1131,7 +1131,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr& } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } @@ -3625,7 +3625,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); df.writeEntry("Name", item->name()); - df.writeEntry("GenericName", i18n("Directory: %1").tqarg(kurl.upURL().path())); + df.writeEntry("GenericName", i18n("Directory: %1").arg(kurl.upURL().path())); df.writeEntry("Icon", item->iconName()); df.writeEntry("URL", text); diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui index 113fc905b..ee4f26ffa 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -73,7 +73,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -102,7 +102,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -129,7 +129,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 8dfaa00d2..2e0543dae 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -87,9 +87,9 @@ void PanelRemoveAppletMenu::slotAboutToShow() void PanelRemoveAppletMenu::slotExec(int id) { - if (m_containers.tqat(id) != m_containers.end()) + if (m_containers.at(id) != m_containers.end()) { - m_containerArea->removeContainer(*m_containers.tqat(id)); + m_containerArea->removeContainer(*m_containers.at(id)); } } diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 678d6a78f..8f02abd67 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -95,9 +95,9 @@ void PanelRemoveButtonMenu::slotAboutToShow() void PanelRemoveButtonMenu::slotExec( int id ) { - if (containers.tqat(id) != containers.end()) + if (containers.at(id) != containers.end()) { - containerArea->removeContainer(*containers.tqat(id)); + containerArea->removeContainer(*containers.at(id)); } } diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 9a1655bae..9d5d80d2b 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -100,9 +100,9 @@ void PanelRemoveExtensionMenu::slotExec( int id ) { ExtensionManager::the()->removeAllContainers(); } - else if (m_containers.tqat(id) != m_containers.end()) + else if (m_containers.at(id) != m_containers.end()) { - ExtensionManager::the()->removeContainer(*m_containers.tqat(id)); + ExtensionManager::the()->removeContainer(*m_containers.at(id)); } } diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 982586c2f..8dcc2fbde 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -281,7 +281,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } @@ -445,7 +445,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, return; // ignore dotfiles. - if ((serviceName.tqat(0) == '.')) + if ((serviceName.at(0) == '.')) return; // item names may contain ampersands. To avoid them being converted diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 97df6918d..490f5bbfe 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o) void KickerTip::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } void KickerTip::enableTipping(bool tip) diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 6d628a7e9..abd181820 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -438,7 +438,7 @@ void PanelButton::enterEvent(TQEvent* e) if (!m_highlight && m_disableHighlighting == FALSE) { m_highlight = true; - tqrepaint(false); + repaint(false); } TQButton::enterEvent(e); @@ -449,7 +449,7 @@ void PanelButton::leaveEvent(TQEvent* e) if (m_highlight) { m_highlight = false; - tqrepaint(false); + repaint(false); } TQButton::leaveEvent(e); @@ -558,7 +558,7 @@ void PanelButton::drawButton(TQPainter *p) } else if (isDown() || isOn()) { - // Draw tqshapes to indicate the down state. + // Draw shapes to indicate the down state. tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index bc85c4521..f809c2127 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -202,7 +202,7 @@ void SimpleButton::enterEvent( TQEvent *e ) if (KickerSettings::showMouseOverEffects()) m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -210,7 +210,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index be060b75c..afd1127f6 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -185,7 +185,7 @@ void KonsoleMenu::initialize() screenList.append(TQFile::decodeName(entry->d_name)); insertItem(SmallIconSet("konsole"), i18n("Screen is a program controlling screens!", - "Screen at %1").tqarg(entry->d_name), id); + "Screen at %1").arg(entry->d_name), id); id++; } } diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 3f50e5275..93a948dee 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -113,7 +113,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, } // ignore dotfiles. - if ((serviceName.tqat(0) == '.')) + if ((serviceName.at(0) == '.')) { return; } @@ -290,7 +290,7 @@ void PrefMenu::initialize() } // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) { continue; } diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 26b11a6ac..61745d8ba 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -228,7 +228,7 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) void AppletProxy::repaintApplet(TQWidget* widget) { - widget->tqrepaint(); + widget->repaint(); const TQObjectList children = widget->childrenListObject(); @@ -375,11 +375,11 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int tqalignment; - dataStream >> tqalignment; + int alignment; + dataStream >> alignment; if(_applet) { - _applet->setAlignment( (KPanelApplet::Alignment)tqalignment ); + _applet->setAlignment( (KPanelApplet::Alignment)alignment ); } return true; } @@ -435,7 +435,7 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, if(_applet) if ( _bg.isNull() ) { // no transparency _applet->unsetPalette(); - _applet->tqrepaint(); + _applet->repaint(); } else { //transparency _applet->blockSignals(true); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 8fc230352..48a64c612 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -290,11 +290,11 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int tqalignment; - dataStream >> tqalignment; + int alignment; + dataStream >> alignment; if(_extension) { - _extension->setAlignment( (KPanelExtension::Alignment)tqalignment ); + _extension->setAlignment( (KPanelExtension::Alignment)alignment ); } return true; } diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 2dcddc22d..1a156930d 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -1074,7 +1074,7 @@ void TaskBar::activateNextTask(bool forward) TaskContainer::List::iterator it; for (int i = 0; i < numContainers; ++i) { - it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); + it = forward ? list.at(i) : list.at(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1087,7 +1087,7 @@ void TaskBar::activateNextTask(bool forward) // moving forward from the last, or backward from the first, loop around for (int i = 0; i < numContainers; ++i) { - it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); + it = forward ? list.at(i) : list.at(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1101,7 +1101,7 @@ void TaskBar::activateNextTask(bool forward) forcenext = true; // select first for (int i = 0; i < numContainers; ++i) { - it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); + it = forward ? list.at(i) : list.at(numContainers - i - 1); if (it == list.end()) { diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index e66ced291..4f4d15e7c 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -233,9 +233,9 @@ void TaskContainer::setLastActivated() void TaskContainer::animationTimerFired() { - if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end()) + if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end()) { - TQPixmap *pm = *frames.tqat(currentFrame); + TQPixmap *pm = *frames.at(currentFrame); // draw pixmap if ( pm && !pm->isNull() ) { @@ -477,7 +477,7 @@ void TaskContainer::paintEvent( TQPaintEvent* ) } TQPainter p; - p.tqbegin(pm ,this); + p.begin(pm ,this); drawButton(&p); p.end(); @@ -736,7 +736,7 @@ void TaskContainer::drawButton(TQPainter *p) TQPaintDevice* opd = p->device(); p->end(); pm->convertFromImage(img); - p->tqbegin(opd ,this); + p->begin(opd ,this); } else { @@ -754,9 +754,9 @@ void TaskContainer::drawButton(TQPainter *p) } } - if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end()) + if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end()) { - TQPixmap *anim = *frames.tqat(currentFrame); + TQPixmap *anim = *frames.at(currentFrame); if (anim && !anim->isNull()) { @@ -830,13 +830,13 @@ TQString TaskContainer::name() // in common, and then use everything UP TO that as the name in the button while (i < maxLength) { - TQChar check = match.tqat(i).lower(); + TQChar check = match.at(i).lower(); Task::List::iterator itEnd = m_filteredTasks.end(); for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it) { // we're doing a lot of Utf8 -> TQString conversions here // by repeatedly calling visibleIconicName() =/ - if (check != (*it)->visibleName().tqat(i).lower()) + if (check != (*it)->visibleName().at(i).lower()) { if (i > 0) { @@ -856,7 +856,7 @@ TQString TaskContainer::name() } // strip trailing crap - while (i > 0 && !match.tqat(i).isLetterOrNumber()) + while (i > 0 && !match.at(i).isLetterOrNumber()) { --i; } diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index bd8ef360c..4eab82bc1 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -213,7 +213,7 @@ void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e ) void TaskLMBMenu::dragSwitch() { bool ok = false; - Task::Ptr t = m_tasks.tqat(indexOf(m_lastDragId), &ok); + Task::Ptr t = m_tasks.at(indexOf(m_lastDragId), &ok); if (ok) { t->activate(); @@ -264,7 +264,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e) if (index != -1) { bool ok = false; - Task::Ptr task = m_tasks.tqat(index, &ok); + Task::Ptr task = m_tasks.at(index, &ok); if (ok) { Task::List tasks; diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index c77f3522b..369c6e140 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension) Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format, CPSubwindowMode, &picAttr); - // Get tqshaped windows handled correctly. + // Get shaped windows handled correctly. XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId, WindowRegionBounding); XFixesSetPictureClipRegion(dpy, picture, 0, 0, region); diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index a64340b8f..46ce2e090 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -197,7 +197,7 @@ int LDAPProtocol::asyncSearch( LDAPUrl &usrc ) if ( count > 0 ) { attrs = static_cast<char**>( malloc((count+1) * sizeof(char*)) ); for (int i=0; i<count; i++) - attrs[i] = strdup( (*usrc.attributes().tqat(i)).utf8() ); + attrs[i] = strdup( (*usrc.attributes().at(i)).utf8() ); attrs[count] = 0; } diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index c94c9b2c6..61f3ef45f 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -82,7 +82,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString §ion) section = TQString::null; TQString url = _url; - if (url.tqat(0) == '/') { + if (url.at(0) == '/') { if (KStandardDirs::exists(url)) { title = url; return true; @@ -93,7 +93,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString §ion) } } - while (url.tqat(0) == '/') + while (url.at(0) == '/') url.remove(0,1); title = url; @@ -259,7 +259,7 @@ TQStringList MANProtocol::findPages(const TQString &_section, TQStringList list; // kdDebug() << "findPages '" << section << "' '" << title << "'\n"; - if (title.tqat(0) == '/') { + if (title.at(0) == '/') { list.append(title); return list; } @@ -279,7 +279,7 @@ TQStringList MANProtocol::findPages(const TQString &_section, // Section given as argument // sect_list += section; - while (section.tqat(section.length() - 1).isLetter()) { + while (section.at(section.length() - 1).isLetter()) { section.truncate(section.length() - 1); sect_list += section; } @@ -400,7 +400,7 @@ void MANProtocol::output(const char *insert) { m_outputBuffer.writeBlock(insert,strlen(insert)); } - if (!insert || m_outputBuffer.tqat() >= 2048) + if (!insert || m_outputBuffer.at() >= 2048) { m_outputBuffer.close(); data(m_outputBuffer.buffer()); diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index ed0b39dd4..a4dc85e1c 100644 --- a/kioslave/man/man2html.cpp +++ b/kioslave/man/man2html.cpp @@ -1905,7 +1905,7 @@ public: return (index >= 0) && (index < (int)items.count()); } TABLEITEM &at(int index) { - return *items.tqat(index); + return *items.at(index); } TABLEROW *copyLayout() const; diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp index 580a678bc..4a92ee91a 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%").tqarg(percent)); + appendItem(group, "percent", TQString("%1%").arg(percent)); TQPixmap bar(150, 20); TQPainter p(&bar); diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index 1de859542..939f0a36a 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -70,7 +70,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -109,7 +109,7 @@ <string><p><b>%1</b> is an encrypted storage device.</p> <p>Please enter the password to decrypt the storage device.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -189,7 +189,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index 300f5fe32..0ab27f63b 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -857,7 +857,7 @@ void POP3Protocol::get(const KURL & url) TQString cmd, path = url.path(); int maxCommands = (metaData("pipelining") == "on") ? MAX_COMMANDS : 1; - if (path.tqat(0) == '/') + if (path.at(0) == '/') path.remove(0, 1); if (path.isEmpty()) { POP3_DEBUG << "We should be a dir!!" << endl; @@ -1207,7 +1207,7 @@ void POP3Protocol::stat(const KURL & url) { TQString _path = url.path(); - if (_path.tqat(0) == '/') + if (_path.at(0) == '/') _path.remove(0, 1); UDSEntry entry; @@ -1244,7 +1244,7 @@ void POP3Protocol::del(const KURL & url, bool /*isfile */ ) } TQString _path = url.path(); - if (_path.tqat(0) == '/') { + if (_path.at(0) == '/') { _path.remove(0, 1); } diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc index a525b028f..28aaba846 100644 --- a/kioslave/settings/kio_settings.cc +++ b/kioslave/settings/kio_settings.cc @@ -127,7 +127,7 @@ KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath) kdDebug() << "Trying harder to find group " << relPath << endl; for (unsigned int i=0; i<rest.count(); i++) - kdDebug() << "Item (" << *rest.tqat(i) << ")" << endl; + kdDebug() << "Item (" << *rest.at(i) << ")" << endl; while (!rest.isEmpty()) { KServiceGroup::Ptr tmp = KServiceGroup::group(alreadyFound); @@ -251,7 +251,7 @@ void SettingsProtocol::listDir(const KURL& url) continue; // Ignore dotfiles. - if ((g->name().tqat(0) == '.')) + if ((g->name().at(0) == '.')) continue; TQString relPath = g->relPath(); diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index 1d2ff05e4..d4a48239f 100644 --- a/kioslave/smb/kio_smb_auth.cpp +++ b/kioslave/smb/kio_smb_auth.cpp @@ -121,7 +121,7 @@ bool SMBSlave::checkPassword(SMBUrl &url) int index = share.find('/', 1); if (index > 1) share = share.left(index); - if (share.tqat(0) == '/') + if (share.at(0) == '/') share = share.mid(1); info.url.setPath("/" + share); info.verifyPath = true; diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index b79f95fc1..e9a216fd3 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -199,7 +199,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const if (surl.length() == 5) // just the above return kurl; // unchanged - if (surl.tqat(5) != '/') { + if (surl.at(5) != '/') { surl = "smb://" + surl.mid(5); kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl; return KURL(surl); @@ -349,7 +349,7 @@ void SMBSlave::listDir( const KURL& kurl ) TQString comment = TQString::fromUtf8( dirp->comment ); if ( dirp->smbc_type == SMBC_SERVER || dirp->smbc_type == SMBC_WORKGROUP ) { atom.m_str = dirpName.lower(); - atom.m_str.tqat( 0 ) = dirpName.tqat( 0 ).upper(); + atom.m_str.at( 0 ) = dirpName.at( 0 ).upper(); if ( !comment.isEmpty() && dirp->smbc_type == SMBC_SERVER ) atom.m_str += " (" + comment + ")"; } else diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index a3177b5c6..f9c366235 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -54,8 +54,8 @@ void SMBSlave::special( const TQByteArray & data) TQString share,host; if (sl.count()>=2) { - host=(*sl.tqat(0)).mid(2); - share=(*sl.tqat(1)); + host=(*sl.at(0)).mid(2); + share=(*sl.at(1)); kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; } diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 6339f1ee3..2c3de0215 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -504,7 +504,7 @@ void ArchiveProtocol::get( const KURL & url ) if ( !firstRead ) { bufferSize = kMin( maxSize, fileSize ); - buffer.tqresize( bufferSize, TQGArray::SpeedOptim ); + buffer.resize( bufferSize, TQGArray::SpeedOptim ); } const TQ_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong. if ( read != bufferSize ) diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp index 749dd4816..322c944a2 100644 --- a/kioslave/thumbnail/textcreator.cpp +++ b/kioslave/thumbnail/textcreator.cpp @@ -158,13 +158,13 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i } // check for newlines in the text (unix,dos) - TQChar ch = text.tqat( i ); + TQChar ch = text.at( i ); if ( ch == '\n' ) { newLine = true; continue; } - else if ( ch == '\r' && text.tqat(i+1) == '\n' ) + else if ( ch == '\r' && text.at(i+1) == '\n' ) { newLine = true; i++; // skip the next character (\n) as well diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp index 86c19f07a..481339b30 100644 --- a/klipper/historyitem.cpp +++ b/klipper/historyitem.cpp @@ -53,7 +53,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource ) if( KURLDrag::decode( &aSource, urls, metaData )) { // this is from KonqDrag (libkonq) TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" ); - bool cut = !a.isEmpty() && (a.tqat(0) == '1'); // true if 1 + bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } } diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index de6561fe3..c814508c1 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu() { if ( myMenu && myMenu->isVisible() ) { - if ( myMenu->tqgeometry().contains( TQCursor::pos() ) && + if ( myMenu->geometry().contains( TQCursor::pos() ) && myPopupKillTimeout > 0 ) { myPopupKillTimer->start( 1000 * myPopupKillTimeout, true ); diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index 73e0b8382..0319fd2e3 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -145,7 +145,7 @@ <property name="text"> <string>Select the type of network folder you wish to connect to and press the Next button.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -186,7 +186,7 @@ <property name="text"> <string>Enter a name for this <i>%1</i> as well as the server address, port and folder path to use and press the Next button.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 055ffb683..2f42405d8 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -110,11 +110,11 @@ TQString KonqAboutPageFactory::launch() TQString home_folder = TQDir::homeDirPath(); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); + res = res.arg( "" ); // Try to split page in three. If it succeeds, insert the default search into the middle part. TQStringList parts = TQStringList::split( "<!--search bar splitter-->", res ); @@ -123,56 +123,56 @@ TQString KonqAboutPageFactory::launch() config.setGroup( "General" ); TQString name = config.readEntry("DefaultSearchEngine"); KService::Ptr service = - KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(name)); + KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(name)); if ( service ) { TQString searchBar = parts[1]; searchBar = searchBar - .tqarg( iconSize ).tqarg( iconSize ) - .tqarg( service->name() ) - .tqarg( service->property("Keys").toStringList()[0] ) + .arg( iconSize ).arg( iconSize ) + .arg( service->name() ) + .arg( service->property("Keys").toStringList()[0] ) ; res = parts[0] + searchBar + parts[2]; } else res = parts[0] + parts[2]; } - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( home_folder ) - .tqarg( home_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( home_folder ) - .tqarg( i18n( "Home Folder" ) ) - .tqarg( i18n( "Your personal files" ) ) - .tqarg( storage_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Storage Media" ) ) - .tqarg( i18n( "Disks and removable media" ) ) - .tqarg( remote_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Network Folders" ) ) - .tqarg( i18n( "Shared files and folders" ) ) - .tqarg( wastebin_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Trash" ) ) - .tqarg( i18n( "Browse and restore the trash" ) ) - .tqarg( applications_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "Applications" ) ) - .tqarg( i18n( "Installed programs" ) ) - .tqarg( help_icon_path ) - .tqarg(iconSize).tqarg(iconSize) - .tqarg( i18n( "About Kubuntu" ) ) - .tqarg( i18n( "<a href=\"help:/kubuntu/\">Kubuntu Documentation</a>" ) ) - .tqarg( continue_icon_path ) - .tqarg( KIcon::SizeSmall ).tqarg( KIcon::SizeSmall ) - .tqarg( i18n( "Next: An Introduction to Konqueror" ) ) + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) + .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( home_folder ) + .arg( home_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( home_folder ) + .arg( i18n( "Home Folder" ) ) + .arg( i18n( "Your personal files" ) ) + .arg( storage_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Storage Media" ) ) + .arg( i18n( "Disks and removable media" ) ) + .arg( remote_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Network Folders" ) ) + .arg( i18n( "Shared files and folders" ) ) + .arg( wastebin_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Trash" ) ) + .arg( i18n( "Browse and restore the trash" ) ) + .arg( applications_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "Applications" ) ) + .arg( i18n( "Installed programs" ) ) + .arg( help_icon_path ) + .arg(iconSize).arg(iconSize) + .arg( i18n( "About Kubuntu" ) ) + .arg( i18n( "<a href=\"help:/kubuntu/\">Kubuntu Documentation</a>" ) ) + .arg( continue_icon_path ) + .arg( KIcon::SizeSmall ).arg( KIcon::SizeSmall ) + .arg( i18n( "Next: An Introduction to Konqueror" ) ) ; i18n("Search the Web");//i18n for possible future use @@ -195,42 +195,42 @@ TQString KonqAboutPageFactory::intro() TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); - - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n( "Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( i18n( "Konqueror makes working with and managing your files easy. You can browse " + res = res.arg( "" ); + + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n( "Conquer your Desktop!") ) + .arg( i18n( "Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( i18n( "Konqueror makes working with and managing your files easy. You can browse " "both local and networked folders while enjoying advanced features " "such as the powerful sidebar and file previews." ) ) - .tqarg( i18n( "Konqueror is also a full featured and easy to use web browser which you " + .arg( i18n( "Konqueror is also a full featured and easy to use web browser which you " "can use to explore the Internet. " "Enter the address (e.g. <a href=\"http://www.kde.org\">http://www.kde.org</A>) " "of a web page you would like to visit in the location bar and press Enter, " "or choose an entry from the Bookmarks menu.") ) - .tqarg( i18n( "To return to the previous " + .arg( i18n( "To return to the previous " "location, press the back button <img width='16' height='16' src=\"%1\"> " - "in the toolbar. ").tqarg( back_icon_path ) ) - .tqarg( i18n( "To quickly go to your Home folder press the " - " home button <img width='16' height='16' src=\"%1\">." ).tqarg(gohome_icon_path) ) - .tqarg( i18n( "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>." ) - .tqarg("exec:/khelpcenter") ) - .tqarg( i18n( "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster," + "in the toolbar. ").arg( back_icon_path ) ) + .arg( i18n( "To quickly go to your Home folder press the " + " home button <img width='16' height='16' src=\"%1\">." ).arg(gohome_icon_path) ) + .arg( i18n( "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>." ) + .arg("exec:/khelpcenter") ) + .arg( i18n( "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster," " you can turn off this information screen by clicking <a href=\"%1\">here</a>. You can re-enable it" " by choosing the Help -> Konqueror Introduction menu option, and then pressing " - "Settings -> Save View Profile \"Web Browsing\".").tqarg("config:/disable_overview") ) - .tqarg( "<img width='16' height='16' src=\"%1\">" ).tqarg( continue_icon_path ) - .tqarg( i18n( "Next: Tips & Tricks" ) ) + "Settings -> Save View Profile \"Web Browsing\".").arg("config:/disable_overview") ) + .arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path ) + .arg( i18n( "Next: Tips & Tricks" ) ) ; @@ -250,69 +250,69 @@ TQString KonqAboutPageFactory::specs() if ( res.isEmpty() ) return res; - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); - - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( i18n("Specifications") ) - .tqarg( i18n("Konqueror is designed to embrace and support Internet standards. " + res = res.arg( "" ); + + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) + .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( i18n("Specifications") ) + .arg( i18n("Konqueror is designed to embrace and support Internet standards. " "The aim is to fully implement the officially sanctioned standards " "from organizations such as the W3 and OASIS, while also adding " "extra support for other common usability features that arise as " "de facto standards across the Internet. Along with this support, " "for such functions as favicons, Internet Keywords, and <A HREF=\"%1\">XBEL bookmarks</A>, " - "Konqueror also implements:").tqarg("http://pyxml.sourceforge.net/topics/xbel/") ) - .tqarg( i18n("Web Browsing") ) - .tqarg( i18n("Supported standards") ) - .tqarg( i18n("Additional requirements*") ) - .tqarg( i18n("<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based " - "<A HREF=\"%2\">HTML 4.01</A>").tqarg("http://www.w3.org/DOM").tqarg("http://www.w3.org/TR/html4/") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").tqarg("http://www.w3.org/Style/CSS/") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").tqarg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) - .tqarg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").tqarg("exec:/kcmshell khtml_java_js") ) - .tqarg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").tqarg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! - .tqarg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support").tqarg("http://java.sun.com") ) - .tqarg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)") - .tqarg("http://www.blackdown.org").tqarg("http://www.ibm.com").tqarg("http://java.sun.com") ) - .tqarg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").tqarg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? - .tqarg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)") - .tqarg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") - .tqarg("http://www.real.com").tqarg("http://www.real.com") - .tqarg("about:plugins") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("Secure Sockets Layer") ) - .tqarg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) - .tqarg( i18n("OpenSSL") ) - .tqarg( i18n("Bidirectional 16bit tqunicode support") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("AutoCompletion for forms") ) - .tqarg( i18n("built-in") ) - .tqarg( i18n("G E N E R A L") ) - .tqarg( i18n("Feature") ) - .tqarg( i18n("Details") ) - .tqarg( i18n("Image formats") ) - .tqarg( i18n("Transfer protocols") ) - .tqarg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") ) - .tqarg( i18n("FTP") ) - .tqarg( i18n("and <A HREF=\"%1\">many more...</A>").tqarg("exec:/kcmshell ioslaveinfo") ) - .tqarg( i18n("URL-Completion") ) - .tqarg( i18n("Manual")) - .tqarg( i18n("Popup")) - .tqarg( i18n("(Short-) Automatic")) - .tqarg( "<img width='16' height='16' src=\"%1\">" ).tqarg( continue_icon_path ) - .tqarg( i18n("<a href=\"%1\">Return to Starting Points</a>").tqarg("launch.html") ) + "Konqueror also implements:").arg("http://pyxml.sourceforge.net/topics/xbel/") ) + .arg( i18n("Web Browsing") ) + .arg( i18n("Supported standards") ) + .arg( i18n("Additional requirements*") ) + .arg( i18n("<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based " + "<A HREF=\"%2\">HTML 4.01</A>").arg("http://www.w3.org/DOM").arg("http://www.w3.org/TR/html4/") ) + .arg( i18n("built-in") ) + .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") ) + .arg( i18n("built-in") ) + .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) + .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) + .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! + .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support").arg("http://java.sun.com") ) + .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)") + .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") ) + .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? + .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)") + .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") + .arg("http://www.real.com").arg("http://www.real.com") + .arg("about:plugins") ) + .arg( i18n("built-in") ) + .arg( i18n("Secure Sockets Layer") ) + .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) + .arg( i18n("OpenSSL") ) + .arg( i18n("Bidirectional 16bit tqunicode support") ) + .arg( i18n("built-in") ) + .arg( i18n("AutoCompletion for forms") ) + .arg( i18n("built-in") ) + .arg( i18n("G E N E R A L") ) + .arg( i18n("Feature") ) + .arg( i18n("Details") ) + .arg( i18n("Image formats") ) + .arg( i18n("Transfer protocols") ) + .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") ) + .arg( i18n("FTP") ) + .arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/kcmshell ioslaveinfo") ) + .arg( i18n("URL-Completion") ) + .arg( i18n("Manual")) + .arg( i18n("Popup")) + .arg( i18n("(Short-) Automatic")) + .arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path ) + .arg( i18n("<a href=\"%1\">Return to Starting Points</a>").arg("launch.html") ) ; @@ -347,57 +347,57 @@ TQString KonqAboutPageFactory::tips() iconloader->iconPath("view_left_right", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.tqarg( "" ); - - res = res.tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n( "Konqueror" ) ) - .tqarg( i18n("Conquer your Desktop!") ) - .tqarg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) - .tqarg( i18n( "Starting Points" ) ) - .tqarg( i18n( "Introduction" ) ) - .tqarg( i18n( "Tips" ) ) - .tqarg( i18n( "Specifications" ) ) - .tqarg( i18n( "Tips & Tricks" ) ) - .tqarg( i18n( "Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " + res = res.arg( "" ); + + res = res.arg( i18n("Conquer your Desktop!") ) + .arg( i18n( "Konqueror" ) ) + .arg( i18n("Conquer your Desktop!") ) + .arg( i18n("Konqueror is your file manager, web browser and universal document viewer.") ) + .arg( i18n( "Starting Points" ) ) + .arg( i18n( "Introduction" ) ) + .arg( i18n( "Tips" ) ) + .arg( i18n( "Specifications" ) ) + .arg( i18n( "Tips & Tricks" ) ) + .arg( i18n( "Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " "using Google, for the search phrase \"KDE\". There are a lot of " "Web-Shortcuts predefined to make searching for software or looking " "up certain words in an encyclopedia a breeze. You can even " - "<a href=\"%1\">create your own</a> Web-Shortcuts." ).tqarg("exec:/kcmshell ebrowsing") ) - .tqarg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the" - " toolbar to increase the font size on your web page.").tqarg(viewmag_icon_path) ) - .tqarg( i18n( "When you want to paste a new address into the Location toolbar you might want to " + "<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") ) + .arg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the" + " toolbar to increase the font size on your web page.").arg(viewmag_icon_path) ) + .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to " "clear the current entry by pressing the black arrow with the white cross " "<img width='16' height='16' src=\"%1\"> in the toolbar.") - .tqarg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path)) - .tqarg( i18n( "To create a link on your desktop pointing to the current page, " + .arg(TQApplication::reverseLayout() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path)) + .arg( i18n( "To create a link on your desktop pointing to the current page, " "simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to " "the desktop, and choose \"Link\"." ) ) - .tqarg( i18n( "You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode\" " + .arg( i18n( "You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode\" " "in the Settings menu. This feature is very useful for \"Talk\" " - "sessions.").tqarg(window_fullscreen_icon_path) ) - .tqarg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window " + "sessions.").arg(window_fullscreen_icon_path) ) + .arg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window " "into two parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> Split View " "Left/Right) you can make Konqueror appear the way you like. You" " can even load some example view-profiles (e.g. Midnight Commander)" - ", or create your own ones." ).tqarg(view_left_right_icon_path)) - .tqarg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting " + ", or create your own ones." ).arg(view_left_right_icon_path)) + .arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting " "asks you to use a different browser " - "(and do not forget to send a complaint to the webmaster!)" ).tqarg("exec:/kcmshell useragent") ) - .tqarg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures " - "that you can keep track of the pages you have visited recently.").tqarg(history_icon_path) ) - .tqarg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your" - " Internet connection.").tqarg("exec:/kcmshell proxy") ) - .tqarg( i18n( "Advanced users will appreciate the Konsole which you can embed into " + "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") ) + .arg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures " + "that you can keep track of the pages you have visited recently.").arg(history_icon_path) ) + .arg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your" + " Internet connection.").arg("exec:/kcmshell proxy") ) + .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into " "Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show " - "Terminal Emulator).").tqarg(openterm_icon_path)) - .tqarg( i18n( "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror using a script." -).tqarg("exec:/kdcop") ) - .tqarg( i18n( "<img width='16' height='16' src=\"%1\">" ).tqarg( continue_icon_path ) ) - .tqarg( i18n( "Next: Specifications" ) ) + "Terminal Emulator).").arg(openterm_icon_path)) + .arg( i18n( "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror using a script." +).arg("exec:/kdcop") ) + .arg( i18n( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path ) ) + .arg( i18n( "Next: Specifications" ) ) ; @@ -413,10 +413,10 @@ TQString KonqAboutPageFactory::plugins() return *s_plugins_html; TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" )) - .tqarg(i18n("Installed Plugins")) - .tqarg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>")) - .tqarg(i18n("Installed")) - .tqarg(i18n("<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>")); + .arg(i18n("Installed Plugins")) + .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>")) + .arg(i18n("Installed")) + .arg(i18n("<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>")); if ( res.isEmpty() ) return res; @@ -489,7 +489,7 @@ void KonqAboutPage::restoreState( TQDataStream &stream ) void KonqAboutPage::serve( const TQString& html, const TQString& what ) { m_what = what; - begin( KURL( TQString("about:%1").tqarg(what) ) ); + begin( KURL( TQString("about:%1").arg(what) ) ); write( html ); end(); m_htmlDoc = html; diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 807e87e57..60a384102 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -404,7 +404,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); if ( profile.isEmpty() ) { - fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() ); ::exit( 0 ); } KonquerorIface_stub konqy( appId, "KonquerorIface" ); @@ -630,7 +630,7 @@ bool clientApp::doIt() } else { - fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").tqarg(TQString::fromLocal8Bit(command)).local8Bit().data() ); + fprintf( stderr, "%s", i18n("Syntax Error: Unknown command '%1'\n").arg(TQString::fromLocal8Bit(command)).local8Bit().data() ); return false; } return true; diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 71d1fb7a6..3380da6d6 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -206,7 +206,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons setXMLFile( "konq_iconview.rc" ); - // Don't tqrepaint on configuration changes during construction + // Don't repaint on configuration changes during construction m_bInit = true; m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), @@ -686,7 +686,7 @@ void KonqKfmIconView::newIconSize( int size ) // Stop a preview job that might be running m_pIconView->stopImagePreview(); - // Set icons size, arrage items in grid and tqrepaint the whole view + // Set icons size, arrage items in grid and repaint the whole view m_pIconView->setIcons( size ); // If previews are enabled start a new job @@ -873,7 +873,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url ) if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { m_pIconView->viewport()->setUpdatesEnabled( true ); - m_pIconView->viewport()->tqrepaint(); + m_pIconView->viewport()->repaint(); } if ( m_pEnsureVisible ){ m_pIconView->ensureItemVisible( m_pEnsureVisible ); @@ -889,11 +889,11 @@ void KonqKfmIconView::slotCompleted() m_pTimeoutRefreshTimer->stop(); // If updates to the viewport are still blocked (so slotNewItems() has - // not been called), a viewport tqrepaint is forced. + // not been called), a viewport repaint is forced. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { m_pIconView->viewport()->setUpdatesEnabled( true ); - m_pIconView->viewport()->tqrepaint(); + m_pIconView->viewport()->repaint(); } // Root item ? Store root item in konqiconviewwidget (whether 0L or not) @@ -1136,7 +1136,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries ) } else { - // In case we replace a big icon with a small one, need to tqrepaint. + // In case we replace a big icon with a small one, need to repaint. if ( bNeedRepaint ) m_pIconView->updateContents(); } @@ -1248,7 +1248,7 @@ void KonqKfmIconView::slotRefreshViewport() TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); vp->setUpdatesEnabled( true ); - vp->tqrepaint(); + vp->repaint(); vp->setUpdatesEnabled( prevState ); } diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index f0855fec0..2ad58a682 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -218,7 +218,7 @@ void CreateCommand::unexecute() { KBookmark bk = CurrentMgr::bookmarkAt(m_to); Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull()); - ListView::self()->tqinvalidate(bk.address()); + ListView::self()->invalidate(bk.address()); bk.parentGroup().deleteBookmark(bk); } diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 62702a1c3..1fa31e967 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -158,12 +158,12 @@ TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListVie return bookmarks; } -void ListView::tqinvalidate(const TQString & address) +void ListView::invalidate(const TQString & address) { - tqinvalidate(getItemAtAddress(address)); + invalidate(getItemAtAddress(address)); } -void ListView::tqinvalidate(TQListViewItem * item) +void ListView::invalidate(TQListViewItem * item) { if(item->isSelected()) { @@ -181,7 +181,7 @@ void ListView::tqinvalidate(TQListViewItem * item) TQListViewItem * child = item->firstChild(); while(child) { - //tqinvalidate(child); + //invalidate(child); child = child->nextSibling(); } } @@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item) else deselectAllChildren(child); } - child->tqrepaint(); + child->repaint(); child = static_cast<KEBListViewItem *>(child->nextSibling()); } } diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index c05226ff6..7ffe76c37 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -56,7 +56,7 @@ public: void setTmpStatus(const TQString &); void restoreStatus(); - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void setSelected ( bool s ); virtual void setOpen(bool); @@ -140,8 +140,8 @@ public: // selected item stuff void selected(KEBListViewItem * item, bool s); - void tqinvalidate(const TQString & address); - void tqinvalidate(TQListViewItem * item); + void invalidate(const TQString & address); + void invalidate(TQListViewItem * item); void fixUpCurrent(const TQString & address); KEBListViewItem * firstSelected() const; diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index e60761b9c..df25a5e6c 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -48,12 +48,12 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his { assert ( popup ); // kill me if this 0... :/ - //kdDebug(1202) << "fillHistoryPopup position: " << history.tqat() << endl; + //kdDebug(1202) << "fillHistoryPopup position: " << history.at() << endl; HistoryEntry * current = history.current(); TQPtrListIterator<HistoryEntry> it( history ); if (onlyBack || onlyForward) { - it += history.tqat(); // Jump to current item + it += history.at(); // Jump to current item if ( !onlyForward ) --it; else ++it; // And move off it } else if ( startPos ) it += startPos; // Jump to specified start pos @@ -75,7 +75,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his break; if ( !onlyForward ) --it; else ++it; } - //kdDebug(1202) << "After fillHistoryPopup position: " << history.tqat() << endl; + //kdDebug(1202) << "After fillHistoryPopup position: " << history.at() << endl; } /////////////////////////////// @@ -116,7 +116,7 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history if (history.isEmpty()) return; // nothing to do - //kdDebug(1202) << "fillGoMenu position: " << history.tqat() << endl; + //kdDebug(1202) << "fillGoMenu position: " << history.at() << endl; if ( m_firstIndex == 0 ) // should never happen since done in plug m_firstIndex = m_goMenu->count(); else @@ -136,10 +136,10 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history // Second case: big history, in one or both directions { // Assume both directions first (in this case we place the current URL in the middle) - m_startPos = history.tqat() + 4; + m_startPos = history.at() + 4; // Forward not big enough ? - if ( history.tqat() > (int)history.count() - 4 ) + if ( history.at() > (int)history.count() - 4 ) m_startPos = history.count() - 1; } Q_ASSERT( m_startPos >= 0 && (uint)m_startPos < history.count() ); @@ -148,7 +148,7 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history kdWarning() << "m_startPos=" << m_startPos << " history.count()=" << history.count() << endl; return; } - m_currentPos = history.tqat(); // for slotActivated + m_currentPos = history.at(); // for slotActivated KonqBidiHistoryAction::fillHistoryPopup( history, m_goMenu, false, false, true, m_startPos ); } @@ -444,7 +444,7 @@ void KonqMostOftenURLSAction::slotFillMenu() m_popupList.clear(); int id = s_mostEntries->count() -1; - KonqHistoryEntry *entry = s_mostEntries->tqat( id ); + KonqHistoryEntry *entry = s_mostEntries->at( id ); while ( entry ) { // we take either title, typedURL or URL (in this order) TQString text = entry->title.isEmpty() ? (entry->typedURL.isEmpty() ? @@ -459,7 +459,7 @@ void KonqMostOftenURLSAction::slotFillMenu() // This prevents crashes when another process tells us to remove an entry. m_popupList.prepend( entry->url ); - entry = (id > 0) ? s_mostEntries->tqat( --id ) : 0L; + entry = (id > 0) ? s_mostEntries->at( --id ) : 0L; } setEnabled( !s_mostEntries->isEmpty() ); Q_ASSERT( s_mostEntries->count() == m_popupList.count() ); diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h index 41dbdad71..849d45668 100644 --- a/konqueror/konq_actions.h +++ b/konqueror/konq_actions.h @@ -62,7 +62,7 @@ signals: private: uint m_firstIndex; // first index in the Go menu int m_startPos; - int m_currentPos; // == history.tqat() + int m_currentPos; // == history.at() TQPopupMenu *m_goMenu; // hack }; diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 8c5218920..fc2f6b901 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -307,7 +307,7 @@ void KonqCombo::updatePixmaps() updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); } setUpdatesEnabled( true ); - tqrepaint(); + repaint(); restoreState(); } @@ -646,7 +646,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) void KonqCombo::setPageSecurity( int pageSecurity ) { m_pageSecurity = pageSecurity; - tqrepaint(); + repaint(); } bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) @@ -850,7 +850,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items ) insertStringList( items ); else { //Keep track of whether we need to change anything, - //so we can avoid a tqrepaint for identical updates, + //so we can avoid a repaint for identical updates, //to reduce flicker bool dirty = false; diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 0da7cd29a..b769184bc 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -352,8 +352,8 @@ void KonqFrame::printFrameInfo( const TQString& spaces ) { TQString className = "NoPart"; if (part()) className = part()->widget()->className(); - kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").tqarg(isVisible()) << " containing view " - << childView() << " visible=" << TQString("%1").tqarg(isVisible()) + kdDebug(1202) << spaces << "KonqFrame " << this << " visible=" << TQString("%1").arg(isVisible()) << " containing view " + << childView() << " visible=" << TQString("%1").arg(isVisible()) << " and part " << part() << " whose widget is a " << className << endl; } @@ -463,7 +463,7 @@ KonqFrame::paintEvent( TQPaintEvent* ) #ifdef USE_QT4 #warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons) #else // USE_QT4 - m_pStatusBar->tqrepaint(); + m_pStatusBar->repaint(); #endif // USE_QT4 } @@ -580,7 +580,7 @@ KonqFrameBase* KonqFrameContainer::otherChild( KonqFrameBase* child ) void KonqFrameContainer::printFrameInfo( const TQString& spaces ) { - kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").tqarg(isVisible()) + kdDebug(1202) << spaces << "KonqFrameContainer " << this << " visible=" << TQString("%1").arg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) kdDebug(1202) << "WARNING: " << this << " has a null active child!" << endl; diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index b7e756971..caf909d68 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -191,7 +191,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) TQString name = (*cIt)->desktopEntryName(); //kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl; KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); - action->setCheckedState( i18n( "Hide %1" ).tqarg( (*cIt)->name() ) ); + action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) ); // HACK if ( (*cIt)->icon() != "unknown" ) diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 457f6ed21..92ff14c4a 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -218,14 +218,14 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other ) for (uint i = 0; i < m_pChildFrameList->count(); i++ ) { - m_pChildFrameList->tqat(i)->copyHistory( static_cast<KonqFrameTabs *>( other )->m_pChildFrameList->tqat(i) ); + m_pChildFrameList->at(i)->copyHistory( static_cast<KonqFrameTabs *>( other )->m_pChildFrameList->at(i) ); } } void KonqFrameTabs::printFrameInfo( const TQString& spaces ) { kdDebug(1202) << spaces << "KonqFrameTabs " << this << " visible=" - << TQString("%1").tqarg(isVisible()) << " activeChild=" + << TQString("%1").arg(isVisible()) << " activeChild=" << m_pActiveChild << endl; if (!m_pActiveChild) @@ -234,7 +234,7 @@ void KonqFrameTabs::printFrameInfo( const TQString& spaces ) KonqFrameBase* child; int childFrameCount = m_pChildFrameList->count(); for (int i = 0 ; i < childFrameCount ; i++) { - child = m_pChildFrameList->tqat(i); + child = m_pChildFrameList->at(i); if (child != 0L) child->printFrameInfo(spaces + " "); else @@ -346,7 +346,7 @@ void KonqFrameTabs::moveTabForward( int index ) void KonqFrameTabs::slotMovedTab( int from, int to ) { - KonqFrameBase* fromFrame = m_pChildFrameList->tqat( from ); + KonqFrameBase* fromFrame = m_pChildFrameList->at( from ); m_pChildFrameList->remove( fromFrame ); m_pChildFrameList->insert( to, fromFrame ); diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 4278d5522..8037b3927 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -117,7 +117,7 @@ KonqView::~KonqView() if (part_url.isNull()) part_url = ""; TQCString line; - line = ( TQString("close(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8(); + line = ( TQString("close(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line, line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -155,9 +155,9 @@ void KonqView::openURL( const KURL &url, const TQString & locationBarURL, TQCString line; - line = ( TQString("closed(%1):%2\n").tqarg(m_randID,0,16).tqarg(part_url) ).utf8(); + line = ( TQString("closed(%1):%2\n").arg(m_randID,0,16).arg(part_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); - line = ( TQString("opened(%3):%4\n").tqarg(m_randID,0,16).tqarg(url_url) ).utf8(); + line = ( TQString("opened(%3):%4\n").arg(m_randID,0,16).arg(url_url) ).utf8(); KonqMainWindow::s_crashlog_file->writeBlock(line,line.length()); KonqMainWindow::s_crashlog_file->flush(); } @@ -227,7 +227,7 @@ void KonqView::openURL( const KURL &url, const TQString & locationBarURL, KonqHistoryManager::kself()->addPending( url, locationBarURL, TQString::null); #ifdef DEBUG_HISTORY - kdDebug(1202) << "Current position : " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Current position : " << m_lstHistory.at() << endl; #endif } @@ -711,7 +711,7 @@ void KonqView::createHistoryEntry() #ifdef DEBUG_HISTORY kdDebug(1202) << "Truncating history" << endl; #endif - m_lstHistory.tqat( m_lstHistory.count() - 1 ); // go to last one + m_lstHistory.at( m_lstHistory.count() - 1 ); // go to last one for ( ; m_lstHistory.current() != current ; ) { if ( !m_lstHistory.removeLast() ) // and remove from the end (faster and easier) @@ -720,7 +720,7 @@ void KonqView::createHistoryEntry() // makes current() null if it's the last item. however in qt2 // the behaviour was different than the documentation. this is // changed in qt3 to behave as documented ;-) (Simon) - m_lstHistory.tqat( m_lstHistory.count() - 1 ); + m_lstHistory.at( m_lstHistory.count() - 1 ); } // Now current is the current again. } @@ -730,9 +730,9 @@ void KonqView::createHistoryEntry() #endif m_lstHistory.append( new HistoryEntry ); // made current #ifdef DEBUG_HISTORY - kdDebug(1202) << "at=" << m_lstHistory.tqat() << " count=" << m_lstHistory.count() << endl; + kdDebug(1202) << "at=" << m_lstHistory.at() << " count=" << m_lstHistory.count() << endl; #endif - assert( m_lstHistory.tqat() == (int) m_lstHistory.count() - 1 ); + assert( m_lstHistory.at() == (int) m_lstHistory.count() - 1 ); } void KonqView::updateHistoryEntry( bool saveLocationBarURL ) @@ -752,20 +752,20 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL ) } #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.at() << endl; #endif current->url = m_pPart->url(); if (saveLocationBarURL) { #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.at() << endl; #endif current->locationBarURL = m_sLocationBarURL; current->pageSecurity = m_pageSecurity; } #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.at() << endl; #endif current->title = m_caption; current->strServiceType = m_serviceType; @@ -800,7 +800,7 @@ void KonqView::go( int steps ) return; } - int newPos = m_lstHistory.tqat() + steps; + int newPos = m_lstHistory.at() + steps; #ifdef DEBUG_HISTORY kdDebug(1202) << "go : steps=" << steps << " newPos=" << newPos @@ -813,13 +813,13 @@ void KonqView::go( int steps ) stop(); // Yay, we can move there without a loop ! - HistoryEntry *currentHistoryEntry = m_lstHistory.tqat( newPos ); // sets current item + HistoryEntry *currentHistoryEntry = m_lstHistory.at( newPos ); // sets current item assert( currentHistoryEntry ); - assert( newPos == m_lstHistory.tqat() ); // check we moved (i.e. if I understood the docu) + assert( newPos == m_lstHistory.at() ); // check we moved (i.e. if I understood the docu) assert( currentHistoryEntry == m_lstHistory.current() ); #ifdef DEBUG_HISTORY - kdDebug(1202) << "New position " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "New position " << m_lstHistory.at() << endl; #endif restoreHistory(); @@ -866,7 +866,7 @@ void KonqView::restoreHistory() m_pMainWindow->updateToolBarActions(); #ifdef DEBUG_HISTORY - kdDebug(1202) << "New position (2) " << m_lstHistory.tqat() << endl; + kdDebug(1202) << "New position (2) " << m_lstHistory.at() << endl; #endif } @@ -874,9 +874,9 @@ const HistoryEntry * KonqView::historyAt(const int pos) { if(pos<0 || pos>=(int)m_lstHistory.count()) return 0L; - int oldpos = m_lstHistory.tqat(); - const HistoryEntry* h = m_lstHistory.tqat(pos); - m_lstHistory.tqat( oldpos ); + int oldpos = m_lstHistory.at(); + const HistoryEntry* h = m_lstHistory.at(pos); + m_lstHistory.at( oldpos ); return h; } @@ -887,7 +887,7 @@ void KonqView::copyHistory( KonqView *other ) TQPtrListIterator<HistoryEntry> it( other->m_lstHistory ); for (; it.current(); ++it ) m_lstHistory.append( new HistoryEntry( *it.current() ) ); - m_lstHistory.tqat(other->m_lstHistory.tqat()); + m_lstHistory.at(other->m_lstHistory.at()); } KURL KonqView::url() const diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index d251da53b..1329000f8 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -125,17 +125,17 @@ public: /** * @return true if view can go back */ - bool canGoBack()const { return m_lstHistory.tqat() > 0; } + bool canGoBack()const { return m_lstHistory.at() > 0; } /** * @return true if view can go forward */ - bool canGoForward()const { return m_lstHistory.tqat() != ((int)m_lstHistory.count())-1; } + bool canGoForward()const { return m_lstHistory.at() != ((int)m_lstHistory.count())-1; } /** * @return the position in the history */ - int historyPos() const { return m_lstHistory.tqat(); } + int historyPos() const { return m_lstHistory.at(); } uint historyLength() { return m_lstHistory.count(); } @@ -149,7 +149,7 @@ public: */ void restoreHistory(); - void setHistoryPos(int newPos) { m_lstHistory.tqat( newPos ); } + void setHistoryPos(int newPos) { m_lstHistory.at( newPos ); } /** * @return the history of this view diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 58848efec..b57ae53bc 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1611,8 +1611,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; - loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL ); - loadItem( cfg, newContainer, childList.tqat(1), defaultURL, openURL ); + loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL ); + loadItem( cfg, newContainer, childList.at(1), defaultURL, openURL ); newContainer->setSizes( sizes ); diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/khtmlkttsd.cpp index 1ddba4d93..e832bd27a 100644 --- a/konqueror/kttsplugin/khtmlkttsd.cpp +++ b/konqueror/kttsplugin/khtmlkttsd.cpp @@ -118,13 +118,13 @@ void KHTMLPluginKTTSD::slotReadOut() } // kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl; - dataBuf.tqat(0); // reset data + dataBuf.at(0); // reset data arg << query << ""; if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)", data, replyType, replyData, true) ) TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), i18n( "The DCOP call setText failed." )); - dataBuf.tqat(0); + dataBuf.at(0); arg << 0; if ( !client->call("kttsd", "KSpeech", "startText(uint)", data, replyType, replyData, true) ) diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 842f870ec..b06baaf7d 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); @@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h index 2ba7b8067..e81928118 100644 --- a/konqueror/listview/konq_infolistviewitem.h +++ b/konqueror/listview/konq_infolistviewitem.h @@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem virtual ~KonqInfoListViewItem() { } virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 61e30d269..14a909803 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -169,7 +169,7 @@ void ListViewBrowserExtension::rename() const TQString txt = le->text(); TQString pattern; KMimeType::diagnoseFileName( txt, pattern ); - if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1) + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1); else { diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 57da1803b..016f3d77a 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -173,7 +173,7 @@ void KonqListViewItem::setActive( bool active ) if ( m_bActive == active ) return; - //#### Optimize away tqrepaint if possible, like the iconview does? + //#### Optimize away repaint if possible, like the iconview does? KonqBaseListViewItem::setActive( active ); int iconSize = m_pListViewWidget->iconSize(); iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small @@ -203,7 +203,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) int newWidth = pm.isNull() ? 0 : pm.width(); int newHeight = pm.isNull() ? 0 : pm.height(); - // If the height or width have changed then we're going to have to tqrepaint + // If the height or width have changed then we're going to have to repaint // this whole thing. Fortunately since most of the calls are coming from // setActive() this is the uncommon case. @@ -234,7 +234,7 @@ const TQPixmap* KonqListViewItem::pixmap( int column ) const if ((int)m_pixmaps.count() <= column) return 0; - TQPixmap *pm = m_pixmaps.tqat( column, &ok ); + TQPixmap *pm = m_pixmaps.at( column, &ok ); if( !ok ) return 0; return pm; @@ -294,7 +294,7 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending } } -void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); @@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index 8e78b10f0..b54f1c2db 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem virtual ~KonqListViewItem(); virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index daad55033..b7362603f 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -259,7 +259,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) //search the column in confColumns for ( unsigned int j = 0; j < NumberOfAtoms; j++ ) { - if ( confColumns[j].name == *lstColumns.tqat(i) ) + if ( confColumns[j].name == *lstColumns.at(i) ) { confColumns[j].displayThisOne = true; confColumns[j].displayInColumn = currentColumn; @@ -268,7 +268,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) currentColumn++; if ( i < lstColumnWidths.count() ) - confColumns[j].width = *lstColumnWidths.tqat(i); + confColumns[j].width = *lstColumnWidths.at(i); else { // Default Column widths diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index c55996306..6224be965 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -177,7 +177,7 @@ protected slots: virtual void slotRedirection( const KURL & ); void slotPopupMenu( TQListViewItem *, const TQPoint&, int ); - // forces a tqrepaint on column size changes / branch expansion + // forces a repaint on column size changes / branch expansion // when there is a background pixmap void slotUpdateBackground(); diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 0d40ecfce..8e03e171e 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents() }; } -void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]); @@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index 02a534688..f091781e2 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem // virtual TQString key( int _column, bool asc) const; /** Call this before destroying the text view (decreases reference count * on the view)*/ - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); // virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r ); virtual void updateContents(); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 6f178543a..8a5395b65 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -169,7 +169,7 @@ static TQString findFileName(const TQString* tmpl,bool universal, const TQString void addBackEnd::activatedAddMenu(int id) { - kdDebug() << "activatedAddMenu: " << TQString("%1").tqarg(id) << endl; + kdDebug() << "activatedAddMenu: " << TQString("%1").arg(id) << endl; if (((uint)id) == libNames.size()) doRollBack(); if(((uint)id) >= libNames.size()) @@ -178,13 +178,13 @@ void addBackEnd::activatedAddMenu(int id) KLibLoader *loader = KLibLoader::self(); // try to load the library - TQString libname = *libNames.tqat(id); + TQString libname = *libNames.at(id); KLibrary *lib = loader->library(TQFile::encodeName(libname)); if (lib) { // get the create_ function TQString factory("add_"); - factory = factory+(*libNames.tqat(id)); + factory = factory+(*libNames.at(id)); void *add = lib->symbol(TQFile::encodeName(factory)); if (add) @@ -194,7 +194,7 @@ void addBackEnd::activatedAddMenu(int id) TQMap<TQString,TQString> map; func = (bool (*)(TQString*, TQString*, TQMap<TQString,TQString> *)) add; TQString *tmp = new TQString(""); - if (func(tmp,libParam.tqat(id),&map)) + if (func(tmp,libParam.at(id),&map)) { TQString myFile = findFileName(tmp,m_universal,m_currentProfile); @@ -219,7 +219,7 @@ void addBackEnd::activatedAddMenu(int id) delete tmp; } } else { - kdWarning() << "libname:" << libNames.tqat(id) + kdWarning() << "libname:" << libNames.at(id) << " doesn't specify a library!" << endl; } } @@ -574,7 +574,7 @@ void Sidebar_Widget::activatedMenu(int id) { int tmpViewID=m_latestViewed; for (uint i=0; i<m_buttons.count(); i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if ((int) i != tmpViewID) { if (button->dock && button->dock->isVisibleTo(this)) @@ -598,7 +598,7 @@ void Sidebar_Widget::activatedMenu(int id) m_mainDockWidget->show(); if ((tmpLatestViewed>=0) && (tmpLatestViewed < (int) m_buttons.count())) { - ButtonInfo *button = m_buttons.tqat(tmpLatestViewed); + ButtonInfo *button = m_buttons.at(tmpLatestViewed); if (button && button->dock) { m_noUpdate=true; @@ -694,7 +694,7 @@ void Sidebar_Widget::updateButtons() { for (uint i = 0; i < m_buttons.count(); i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (button->dock) { m_noUpdate = true; @@ -742,7 +742,7 @@ void Sidebar_Widget::createButtons() for (uint i = 0; i < m_buttons.count(); i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (m_openViews.contains(button->file)) { m_buttonBar->setTab(i,true); @@ -763,7 +763,7 @@ bool Sidebar_Widget::openURL(const class KURL &url) if (url.protocol()=="sidebar") { for (unsigned int i=0;i<m_buttons.count();i++) - if (m_buttons.tqat(i)->file==url.path()) + if (m_buttons.at(i)->file==url.path()) { KMultiTabBarTab *tab = m_buttonBar->tab(i); if (!tab->isOn()) @@ -778,7 +778,7 @@ bool Sidebar_Widget::openURL(const class KURL &url) bool ret = false; for (unsigned int i=0;i<m_buttons.count();i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (button->dock) { if ((button->dock->isVisibleTo(this)) && (button->module)) @@ -845,7 +845,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { if (bt==m_buttonBar->tab(i)) { - m_currentButton = m_buttons.tqat(i); + m_currentButton = m_buttons.at(i); break; } } @@ -953,7 +953,7 @@ bool Sidebar_Widget::createView( ButtonInfo *data) void Sidebar_Widget::showHidePage(int page) { - ButtonInfo *info = m_buttons.tqat(page); + ButtonInfo *info = m_buttons.at(page); if (!info->dock) { if (m_buttonBar->isTabRaised(page)) @@ -1072,7 +1072,7 @@ void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) kdDebug()<<" Sidebar_Widget::dockWidgetHasUndocked(KDockWidget*)"<<endl; for (unsigned int i=0;i<m_buttons.count();i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (button->dock==wid) { if (m_buttonBar->isTabRaised(i)) @@ -1255,7 +1255,7 @@ Sidebar_Widget::~Sidebar_Widget() m_noUpdate = true; for (uint i=0;i<m_buttons.count();i++) { - ButtonInfo *button = m_buttons.tqat(i); + ButtonInfo *button = m_buttons.at(i); if (button->dock) button->dock->undock(); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 0ceb93d13..f8d0cc0de 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon() return m_fileItem->iconName() == "folder"; } -void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { if (m_fileItem->isLink()) { @@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup f.setItalic( TRUE ); _painter->setFont( f ); } - TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment ); + TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); } KURL KonqSidebarDirTreeItem::externalURL() const diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h index 3a599c7e9..050f19424 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h @@ -36,7 +36,7 @@ public: virtual void setOpen( bool open ); - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); virtual bool acceptsDrops( const TQStrList & formats ); virtual void drop( TQDropEvent * ev ); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index b83926e21..ac26b1285 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) if (openItem) { // We have this directory listed already, just copy the entries as we - // can't use the dirlister, it would tqinvalidate the old entries + // can't use the dirlister, it would invalidate the old entries int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); KonqSidebarTreeItem * parentItem = item; KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild()); @@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url ) if ( item->childCount() == 0 ) { item->setExpandable( false ); - item->tqrepaint(); + item->repaint(); } m_pTree->stopAnimation( item ); diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index ad2d2a7e2..0d31551f9 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -126,7 +126,7 @@ TQString KonqSidebarHistoryItem::toolTipText() const } void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQDateTime dt; TQDateTime current = TQDateTime::currentDateTime(); @@ -149,7 +149,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, p->setFont( s_settings->m_fontOlderThan ); } - KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment ); + KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment ); } /////////////////////////////////////////////////////////////////// diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h index 0ddc7ae4e..1c6c7c4c4 100644 --- a/konqueror/sidebar/trees/history_module/history_item.h +++ b/konqueror/sidebar/trees/history_module/history_item.h @@ -60,7 +60,7 @@ public: static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; } virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column, - int width, int tqalignment ); + int width, int alignment ); private: const KonqHistoryEntry *m_entry; diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 7755286bc..dc954322f 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->tqrepaint(); + m_dropItem->repaint(); } void KonqSidebarTree::rescanConfiguration() diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 3e18366ab..ed41a8e76 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -150,7 +150,7 @@ extern "C" { int id=names.findIndex( item ); if (id==-1) return false; - KSimpleConfig ksc2(*list.tqat(id)); + KSimpleConfig ksc2(*list.at(id)); ksc2.setGroup("Desktop Entry"); map->insert("Type","Link"); map->insert("Icon",ksc2.readEntry("Icon")); diff --git a/konsole/doc/VT100/Table.Codes b/konsole/doc/VT100/Table.Codes index 2f0554a0b..6ece0f4bf 100644 --- a/konsole/doc/VT100/Table.Codes +++ b/konsole/doc/VT100/Table.Codes @@ -1070,7 +1070,7 @@ DECALN.sect Command DECALN.code HSH|8| DECALN.text Causes the VT100 to fill it's screen with - uppercase Es for screen focus and tqalignment. + uppercase Es for screen focus and alignment. DECALN.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning N/A|VT100|scr|helpAlign||see above diff --git a/konsole/doc/VT100/techref.html b/konsole/doc/VT100/techref.html index 6b39bda55..6e36f39e5 100644 --- a/konsole/doc/VT100/techref.html +++ b/konsole/doc/VT100/techref.html @@ -2234,7 +2234,7 @@ Work is currently in progress to fix this issue. <tr><td><p></td> <tr><td></td> <td colspan=6> Causes the VT100 to fill it's screen with - uppercase Es for screen focus and tqalignment. + uppercase Es for screen focus and alignment. <tr><td><p></td></tr> <tr> <td></td> diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp index 7af02c247..e6355a90e 100644 --- a/konsole/konsole/TEScreen.cpp +++ b/konsole/konsole/TEScreen.cpp @@ -1023,7 +1023,7 @@ void TEScreen::clearEntireScreen() } /*! fill screen with 'E' - This is to aid screen tqalignment + This is to aid screen alignment */ void TEScreen::helpAlign() diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 31d4f5f82..73aa29fee 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -564,7 +564,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, int w; for(unsigned int i=0;i<str.length();i++) { - drawstr = str.tqat(i); + drawstr = str.at(i); // Add double of the width if next c is 0; if ((attr+nc+1)->c) // This may access image[image_size] See makeImage() { @@ -1072,7 +1072,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact) pm.fill(); TQPainter pm_paint; - pm_paint.tqbegin(&pm, TQT_TQWIDGET(this)); + pm_paint.begin(&pm, TQT_TQWIDGET(this)); paintContents(pm_paint, contentsRect(), true); pm_paint.end(); paint.drawPixmap(0, 0, pm); @@ -1159,14 +1159,14 @@ void TEWidget::blinkEvent() { blinking = !blinking; isBlinkEvent = true; - tqrepaint(false); + repaint(false); isBlinkEvent = false; } void TEWidget::blinkCursorEvent() { cursorBlinking = !cursorBlinking; - tqrepaint(cursorRect, true); + repaint(cursorRect, true); } /* ------------------------------------------------------------------------- */ @@ -1742,14 +1742,14 @@ void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev) void TEWidget::focusInEvent( TQFocusEvent * ) { - tqrepaint(cursorRect, true); // *do* erase area, to get rid of the + repaint(cursorRect, true); // *do* erase area, to get rid of the // hollow cursor rectangle. } void TEWidget::focusOutEvent( TQFocusEvent * ) { - tqrepaint(cursorRect, true); // don't erase area + repaint(cursorRect, true); // don't erase area } bool TEWidget::focusNextPrevChild( bool next ) @@ -1860,7 +1860,7 @@ void TEWidget::onClearSelection() //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent' // due to a bug in `QT' or the ignorance of the author to prevent -// tqrepaint events being emitted to the screen whenever one leaves +// repaint events being emitted to the screen whenever one leaves // or reenters the screen to/from another application. // // Troll says one needs to change focusInEvent() and focusOutEvent(), @@ -1984,7 +1984,7 @@ void TEWidget::imEndEvent( TQIMEvent *e ) m_imPreeditLength = 0; m_isIMEdit = m_isIMSel = false; - tqrepaint( repaintRect, true ); + repaint( repaintRect, true ); } // Override any Ctrl+<key> accelerator when pressed with the keyboard diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 0d464417c..b824c4b4e 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -1158,7 +1158,7 @@ void Konsole::makeBasicGUI() TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new KAction(i18n("Switch to Session %1").tqarg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new KAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } new KAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); @@ -1313,7 +1313,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos) if (!m_menuCreated) makeGUI(); - m_contextMenuSession = sessions.tqat( tabwidget->indexOf( _te ) ); + m_contextMenuSession = sessions.at( tabwidget->indexOf( _te ) ); m_tabDetachSession->setEnabled( tabwidget->count()>1 ); @@ -1384,12 +1384,12 @@ void Konsole::slotTabSetViewOptions(int mode) for(int i = 0; i < tabwidget->count(); i++) { TQWidget *page = tabwidget->page(i); - TQIconSet icon = iconSetForSession(sessions.tqat(i)); + TQIconSet icon = iconSetForSession(sessions.at(i)); TQString title; if (b_matchTabWinTitle) - title = sessions.tqat(i)->fullTitle(); + title = sessions.at(i)->fullTitle(); else - title = sessions.tqat(i)->Title(); + title = sessions.at(i)->Title(); title=title.replace('&',"&&"); switch(mode) { @@ -1622,7 +1622,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema); if (!sch) { - sch = (ColorSchema*)colors->tqat(0); //the default one + sch = (ColorSchema*)colors->at(0); //the default one kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl; s_kconfigSchema = sch->relPath(); } @@ -1650,7 +1650,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa delete rootxpms[te]; rootxpms.remove(te); } - pixmap_menu_activated(sch->tqalignment()); + pixmap_menu_activated(sch->alignment()); } te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug @@ -1886,7 +1886,7 @@ void Konsole::updateSchemaMenu() m_schema->clear(); for (int i = 0; i < (int) colors->count(); i++) { - ColorSchema* s = (ColorSchema*)colors->tqat(i); + ColorSchema* s = (ColorSchema*)colors->at(i); assert( s ); TQString title=s->title(); m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); @@ -2002,7 +2002,7 @@ void Konsole::slotSelectTabbar() { /* FIXME: Still necessary ? */ TQPtrDictIterator<KRootPixmap> it(rootxpms); for (;it.current();++it) - it.current()->tqrepaint(true); + it.current()->repaint(true); if (b_fixedSize) { @@ -2129,7 +2129,7 @@ void Konsole::reparseConfiguration() ColorSchema* sch = colors->find(s_kconfigSchema); if (!sch) { - sch = (ColorSchema*)colors->tqat(0); //the default one + sch = (ColorSchema*)colors->at(0); //the default one kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl; s_kconfigSchema = sch->relPath(); } @@ -2500,7 +2500,7 @@ TQString Konsole::sessionId(const int position) if (position<=0 || position>(int)sessions.count()) return ""; - return sessions.tqat(position-1)->SessionId(); + return sessions.at(position-1)->SessionId(); } void Konsole::listSessions() @@ -2526,7 +2526,7 @@ void Konsole::activateSession(int position) { if (position<0 || position>=(int)sessions.count()) return; - activateSession( sessions.tqat(position) ); + activateSession( sessions.at(position) ); } void Konsole::activateSession(TQWidget* w) @@ -2586,11 +2586,11 @@ void Konsole::activateSession(TESession *s) // Set the required schema variables for the current session ColorSchema* cs = colors->find( se->schemaNo() ); if (!cs) - cs = (ColorSchema*)colors->tqat(0); //the default one + cs = (ColorSchema*)colors->at(0); //the default one s_schema = cs->relPath(); curr_schema = cs->numb(); pmPath = cs->imagePath(); - n_render = cs->tqalignment(); + n_render = cs->alignment(); // BR 106464 temporary fix... // only 2 sessions opened, 2nd session viewable, right-click on 1st tab and @@ -2632,7 +2632,7 @@ void Konsole::activateSession(TESession *s) if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() ); masterMode->setChecked( se->isMasterMode() ); sessions.find(se); - uint position=sessions.tqat(); + uint position=sessions.at(); if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0); if (m_moveSessionRight) m_moveSessionRight->setEnabled(position<sessions.count()-1); } @@ -2871,7 +2871,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis ColorSchema* schema = colors->find(sch); if (!schema) - schema=(ColorSchema*)colors->tqat(0); //the default one + schema=(ColorSchema*)colors->at(0); //the default one int schmno = schema->numb(); if (sessions.count()==1 && n_tabbar!=TabNone) @@ -3063,7 +3063,7 @@ void Konsole::doneSession(TESession* s) se = 0; if (sessions.count()) { - se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0); + se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); //FIXME: this Timer stupidity originated from the connected @@ -3081,7 +3081,7 @@ void Konsole::doneSession(TESession* s) } else { sessions.find(se); - uint position=sessions.tqat(); + uint position=sessions.at(); m_moveSessionLeft->setEnabled(position>0); m_moveSessionRight->setEnabled(position<sessions.count()-1); } @@ -3135,7 +3135,7 @@ void Konsole::slotMovedTab(int from, int to) void Konsole::moveSessionLeft() { sessions.find(se); - uint position=sessions.tqat(); + uint position=sessions.at(); if (position==0) return; @@ -3167,7 +3167,7 @@ void Konsole::moveSessionLeft() void Konsole::moveSessionRight() { sessions.find(se); - uint position=sessions.tqat(); + uint position=sessions.at(); if (position==sessions.count()-1) return; @@ -3570,7 +3570,7 @@ void Konsole::setSchema(int numb, TEWidget* tewidget) ColorSchema* s = colors->find(numb); if (!s) { - s = (ColorSchema*)colors->tqat(0); + s = (ColorSchema*)colors->at(0); kdWarning() << "No schema with serial #"<<numb<<", using "<<s->relPath()<<" (#"<<s->numb()<<")." << endl; s_kconfigSchema = s->relPath(); } @@ -3587,7 +3587,7 @@ void Konsole::setSchema(const TQString & path) ColorSchema* s = colors->find(path); if (!s) { - s = (ColorSchema*)colors->tqat(0); //the default one + s = (ColorSchema*)colors->at(0); //the default one kdWarning() << "No schema with the name " <<path<<", using "<<s->relPath()<<endl; s_kconfigSchema = s->relPath(); } @@ -3639,7 +3639,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) delete rootxpms[tewidget]; rootxpms.remove(tewidget); } - pixmap_menu_activated(s->tqalignment(), tewidget); + pixmap_menu_activated(s->alignment(), tewidget); tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff)); } @@ -3718,7 +3718,7 @@ void Konsole::detachSession(TESession* _se) { if (se_previous) se = se_previous; else - se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0); + se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); } @@ -3992,7 +3992,7 @@ void Konsole::slotOpenSelection() m_filterData = new KURIFilterData( selectedURL ); KURIFilter::self()->filterURI( *(m_filterData) ); - m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).tqarg(m_filterData->uri().url()), 1 ); + m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); } @@ -4207,7 +4207,7 @@ void Konsole::toggleBidi() TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setBidiEnabled(b_bidiEnabled); - _te->tqrepaint(); + _te->repaint(); } } diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index d7f871f8d..1054ce826 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -577,7 +577,7 @@ void konsolePart::readProperties() s_kconfigSchema=config->readEntry("schema"); ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema); if (!sch) { - sch=(ColorSchema*)colors->tqat(0); //the default one + sch=(ColorSchema*)colors->at(0); //the default one } if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile(); s_schema = sch->relPath(); @@ -591,7 +591,7 @@ void konsolePart::readProperties() rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); - rootxpm->tqrepaint(true); + rootxpm->repaint(true); } else { te->setBlendColor(tqRgba(sch->tr_r(), sch->tr_g(), sch->tr_b(), int(sch->tr_x() * 255))); @@ -604,7 +604,7 @@ void konsolePart::readProperties() delete rootxpm; rootxpm=0; } - pixmap_menu_activated(sch->tqalignment()); + pixmap_menu_activated(sch->alignment()); } te->setBellMode(n_bell); @@ -737,7 +737,7 @@ void konsolePart::updateSchemaMenu() m_schema->clear(); for (int i = 0; i < (int) colors->count(); i++) { - ColorSchema* s = (ColorSchema*)colors->tqat(i); + ColorSchema* s = (ColorSchema*)colors->at(i); TQString title=s->title(); m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); } @@ -752,7 +752,7 @@ void konsolePart::setSchema(int numb) ColorSchema* s = colors->find(numb); if (!s) { kdWarning() << "No schema found. Using default." << endl; - s=(ColorSchema*)colors->tqat(0); + s=(ColorSchema*)colors->at(0); } if (s->numb() != numb) { kdWarning() << "No schema with number " << numb << endl; @@ -785,7 +785,7 @@ void konsolePart::setSchema(ColorSchema* s) rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); - rootxpm->tqrepaint(true); + rootxpm->repaint(true); } else { te->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); @@ -798,7 +798,7 @@ void konsolePart::setSchema(ColorSchema* s) delete rootxpm; rootxpm=0; } - pixmap_menu_activated(s->tqalignment()); + pixmap_menu_activated(s->alignment()); } te->setColorTable(s->table()); @@ -809,8 +809,8 @@ void konsolePart::notifySize(int /* columns */, int /* lines */) { ColorSchema *sch=colors->find(s_schema); - if (sch && sch->tqalignment() >= 3) - pixmap_menu_activated(sch->tqalignment()); + if (sch && sch->alignment() >= 3) + pixmap_menu_activated(sch->alignment()); } void konsolePart::pixmap_menu_activated(int item) diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index f18b7cfc5..eaf2ea7a8 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c) m_title = c.readEntry("Title",i18n("[no title]")); m_imagePath = c.readEntry("ImagePath"); - m_tqalignment = c.readNumEntry("ImageAlignment",1); + m_alignment = c.readNumEntry("ImageAlignment",1); m_useTransparency = c.readBoolEntry("UseTransparency",false); m_tr_r = c.readNumEntry("TransparentR",0); @@ -203,7 +203,7 @@ void ColorSchema::clearSchema() } m_title = i18n("[no title]"); m_imagePath = ""; - m_tqalignment = 1; + m_alignment = 1; m_useTransparency = false; m_tr_x = 0.0; m_tr_r = 0; @@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema() m_numb = 0; m_title = i18n("Konsole Default"); m_imagePath = ""; // background pixmap - m_tqalignment = 1; // none + m_alignment = 1; // none m_useTransparency = false; // not use pseudo-transparency by default m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side m_tr_x = 0.0; @@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); c.writeEntry("ImagePath",m_imagePath); - c.writeEntry("ImageAlignment",m_tqalignment); + c.writeEntry("ImageAlignment",m_alignment); c.writeEntry("UseTransparency",m_useTransparency); c.writeEntry("TransparentR",m_tr_r); @@ -334,7 +334,7 @@ bool ColorSchema::rereadSchemaFile() TQString qline(line); m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ); - m_tqalignment = attr; + m_alignment = attr; } if (!strncmp(line,"transparency",12)) { float rx; diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 1027a6c9e..fa9f32412 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -150,7 +150,7 @@ protected: int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;}; const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;}; const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;}; - int tqalignment() {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;}; + int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;}; const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;}; bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;}; double tr_x() {if (!m_fileRead) rereadSchemaFile();return m_tr_x;}; @@ -162,7 +162,7 @@ protected: private: int m_numb; int m_tr_r, m_tr_g, m_tr_b; - int m_tqalignment; + int m_alignment; TQString m_title; TQString m_imagePath; ColorEntry m_table[TABLE_COLORS]; @@ -188,7 +188,7 @@ public: const ColorSchema *at(unsigned int i) { return TQPtrList<ColorSchema>::at(i); } ; #ifdef USE_QT4 - const ColorSchema *tqat(unsigned int i) + const ColorSchema *at(unsigned int i) { return at(i); } ; #endif // USE_QT4 diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 6a721127b..f61558540 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -374,7 +374,7 @@ void KPager::configureDialog() updateLayout(); for( TQValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } } @@ -409,7 +409,7 @@ void KPager::slotActiveWindowChanged( WId win ) { if ( (inf1 && inf1->isOnDesktop(i)) || (inf2 && inf2->isOnDesktop(i) ) ) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } @@ -422,7 +422,7 @@ void KPager::slotWindowAdded( WId win) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ( inf->isOnDesktop( i )) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } @@ -438,14 +438,14 @@ void KPager::slotWindowRemoved( WId win ) for (int i = 1; i <= (int) m_desktops.count(); ++i) { if (onAllDesktops || desktop == i) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } } void KPager::slotWindowChanged( WId win , unsigned int prop) { - bool tqrepaint=false; + bool repaint=false; KWin::WindowInfo* inf = m_windows[win]; if (!inf) @@ -453,7 +453,7 @@ void KPager::slotWindowChanged( WId win , unsigned int prop) inf=info(win); prop=0; // info already calls KWin::info, so there's no need // to update anything else. - tqrepaint=true; + repaint=true; }; bool onAllDesktops = inf ? inf->onAllDesktops() : false; @@ -466,15 +466,15 @@ void KPager::slotWindowChanged( WId win , unsigned int prop) } if((prop & ~( NET::WMName | NET::WMVisibleName )) != 0 ) - tqrepaint = true; + repaint = true; - if (tqrepaint) + if (repaint) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ((inf && (inf->isOnDesktop(i))) || onAllDesktops || desktop == i ) { - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } // redrawDesktops(); @@ -485,9 +485,9 @@ void KPager::slotStackingOrderChanged() m_desktops[m_currentDesktop-1]->m_grabWindows=true; for ( int i=1; i <= (int) m_desktops.count(); ++i) { - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } -// tqrepaint(true); +// repaint(true); } void KPager::slotDesktopNamesChanged() @@ -547,8 +547,8 @@ void KPager::slotCurrentDesktopChanged(int desk) m_desktops[m_currentDesktop-1]->update(); m_desktops[desk-1]->paintFrame( true ); m_desktops[desk-1]->update(); -// m_desktops[m_currentDesktop-1]->tqrepaint(); -// m_desktops[desk-1]->tqrepaint(); +// m_desktops[m_currentDesktop-1]->repaint(); +// m_desktops[desk-1]->repaint(); m_currentDesktop=desk; @@ -643,13 +643,13 @@ void KPager::redrawDesktops() { TQValueList <Desktop *>::Iterator it; for( it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } void KPager::slotGrabWindows() { m_desktops[m_currentDesktop-1]->m_grabWindows=true; - m_desktops[m_currentDesktop-1]->tqrepaint(); + m_desktops[m_currentDesktop-1]->repaint(); } TQSize KPager::sizeHint() const diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui index cdad6cd7f..ddab51247 100644 --- a/kpersonalizer/kcountrypagedlg.ui +++ b/kpersonalizer/kcountrypagedlg.ui @@ -84,7 +84,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui index 82386d836..5301c118a 100644 --- a/kpersonalizer/keyecandypagedlg.ui +++ b/kpersonalizer/keyecandypagedlg.ui @@ -63,7 +63,7 @@ <string><P>Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. </P> If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -98,7 +98,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -136,7 +136,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <string>Fast Processor (more effects)</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui index acbb2713f..87ff64d5f 100644 --- a/kpersonalizer/kospagedlg.ui +++ b/kpersonalizer/kospagedlg.ui @@ -167,7 +167,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="text"> <string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui index 0a2c563c4..8b96fd43e 100644 --- a/kpersonalizer/krefinepagedlg.ui +++ b/kpersonalizer/krefinepagedlg.ui @@ -32,7 +32,7 @@ <string><h3>Finished</h3> <p>After closing this dialog you can always restart this Wizard by choosing the entry <b>Desktop Settings Wizard</b> from the Settings menu.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -80,7 +80,7 @@ <property name="text"> <string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry <b>Control Center</b> in the K menu.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -132,7 +132,7 @@ <property name="text"> <string>You can also start the Trinity Control Center using the button below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui index cc3837bbd..d7db08975 100644 --- a/kpersonalizer/kstylepagedlg.ui +++ b/kpersonalizer/kstylepagedlg.ui @@ -31,7 +31,7 @@ <property name="text"> <string>Please choose the way your computer should look by selecting one of the items below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index e5f143229..20a089b8f 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -99,12 +99,12 @@ bool KSysInfo::getRenderSupport(){ void KSysInfo::initFontFamilies() { TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); m_normal_font = TQString::null; m_fixed_font = TQString::null; int normal_priority = 0, fixed_priority = 0; for (uint i=0; i < families.count(); i++) { - TQString font = *families.tqat(i); + TQString font = *families.at(i); //add further NORMAL fonts here if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index c105f8d57..fa4797966 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -67,7 +67,7 @@ void KRootBacking::init() m_bActive = false; connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint())); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); @@ -111,7 +111,7 @@ void KRootBacking::start() } } if (m_bInit) { - tqrepaint(true); + repaint(true); } } @@ -133,16 +133,16 @@ void KRootBacking::setFadeEffect(double fade, const TQColor &color) m_Fade = fade; m_FadeColor = color; - if ( m_bActive && m_bInit ) tqrepaint(true); + if ( m_bActive && m_bInit ) repaint(true); } -void KRootBacking::tqrepaint() +void KRootBacking::repaint() { - tqrepaint(false); + repaint(false); } -void KRootBacking::tqrepaint(bool force) +void KRootBacking::repaint(bool force) { TQWidget* desktopWidget = KApplication::desktop(); TQPoint p1 = desktopWidget->mapToGlobal(desktopWidget->rect().topLeft()); @@ -255,7 +255,7 @@ void KRootBacking::slotBackgroundChanged(int desk) return; if (desk == m_Desk) - tqrepaint(true); + repaint(true); } #include "krootbacking.moc" diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h index 12d6b1bfd..0602bd66c 100644 --- a/krootbacking/krootbacking.h +++ b/krootbacking/krootbacking.h @@ -116,16 +116,16 @@ public slots: * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. * - * @param force Force a tqrepaint, even if the contents did not change. + * @param force Force a repaint, even if the contents did not change. */ - void tqrepaint( bool force ); + void repaint( bool force ); /** * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. This is equivalent to calling - * tqrepaint( false ). + * repaint( false ). */ - void tqrepaint(); + void repaint(); /** * Asks KDesktop to export the desktop background as a KSharedPixmap. diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index 35693b724..cd984a145 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -41,7 +41,7 @@ static void usage(char *name) { puts(i18n("Usage: %1 [-setup] [args]\n" "Starts a random screen saver.\n" - "Any arguments (except -setup) are passed on to the screen saver.").tqarg( name ).local8Bit().data()); + "Any arguments (except -setup) are passed on to the screen saver.").arg( name ).local8Bit().data()); } static const char appName[] = "random"; @@ -201,7 +201,7 @@ int main(int argc, char *argv[]) KRandomSequence rnd; int indx = rnd.getLong(saverFileList.count()); - TQString filename = *(saverFileList.tqat(indx)); + TQString filename = *(saverFileList.at(indx)); KDesktopFile config(filename, true); diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui index 0a1d3b8bf..fe217c476 100644 --- a/ksmserver/timed.ui +++ b/ksmserver/timed.ui @@ -192,7 +192,7 @@ <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -215,7 +215,7 @@ after X automatically.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index 3ae82031a..6f8cc1550 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -57,7 +57,7 @@ public slots: if( mText != s ) { mText = s; - tqrepaint( false ); + repaint( false ); } }; diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index cf0c1ee0a..8d2b5e302 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc @@ -78,7 +78,7 @@ bool BarGraph::removeBar( uint idx ) } samples.resize( --bars ); - footers.remove( footers.tqat( idx ) ); + footers.remove( footers.at( idx ) ); update(); return true; @@ -103,7 +103,7 @@ void BarGraph::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setFont( TQFont( p.font().family(), fontSize ) ); TQFontMetrics fm( p.font() ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index 3d513ace3..3917fc86b 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc @@ -94,11 +94,11 @@ void DancingBars::configureSettings() TQValueList< TQStringList > list; for ( uint i = mBars - 1; i < mBars; i-- ) { TQStringList entry; - entry << sensors().tqat( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); + entry << sensors().at( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); entry << mPlotter->footers[ i ]; - entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); - entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); + entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); list.append( entry ); } @@ -135,8 +135,8 @@ void DancingBars::applySettings() for ( uint i = 0; i < sensors().count(); i++ ) { bool found = false; for ( it = list.begin(); it != list.end(); ++it ) { - if ( (*it)[ 0 ] == sensors().tqat( i )->hostName() && - (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ) ) { + if ( (*it)[ 0 ] == sensors().at( i )->hostName() && + (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ) ) { mPlotter->footers[ i ] = (*it)[ 2 ]; found = true; break; @@ -147,7 +147,7 @@ void DancingBars::applySettings() removeSensor( i ); } - tqrepaint(); + repaint(); setModified( true ); } @@ -158,7 +158,7 @@ void DancingBars::applyStyle() mPlotter->backgroundColor = KSGRD::Style->backgroundColor(); mPlotter->fontSize = KSGRD::Style->fontSize(); - tqrepaint(); + repaint(); setModified( true ); } @@ -185,8 +185,8 @@ bool DancingBars::addSensor( const TQString &hostName, const TQString &name, TQString tooltip; for ( uint i = 0; i < mBars; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( i )->hostName() ) - .arg( sensors().tqat( i )->name() ); + .arg( sensors().at( i )->hostName() ) + .arg( sensors().at( i )->name() ); } TQToolTip::remove( mPlotter ); TQToolTip::add( mPlotter, tooltip ); @@ -209,8 +209,8 @@ bool DancingBars::removeSensor( uint pos ) TQString tooltip; for ( uint i = 0; i < mBars; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( i )->hostName() ) - .arg( sensors().tqat( i )->name() ); + .arg( sensors().at( i )->hostName() ) + .arg( sensors().at( i )->name() ); } TQToolTip::remove( mPlotter ); TQToolTip::add( mPlotter, tooltip ); @@ -272,7 +272,7 @@ void DancingBars::answerReceived( int id, const TQString &answer ) mPlotter->changeRange( info.min(), info.max() ); } - sensors().tqat( id - 100 )->setUnit( info.unit() ); + sensors().at( id - 100 )->setUnit( info.unit() ); } } @@ -331,9 +331,9 @@ bool DancingBars::saveSettings( TQDomDocument &doc, TQDomElement &element, for ( uint i = 0; i < mBars; ++i ) { TQDomElement beam = doc.createElement( "beam" ); element.appendChild( beam ); - beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); - beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); + beam.setAttribute( "hostName", sensors().at( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().at( i )->name() ); + beam.setAttribute( "sensorType", sensors().at( i )->type() ); beam.setAttribute( "sensorDescr", mPlotter->footers[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 89c12a30c..220df65b9 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc @@ -101,10 +101,10 @@ void FancyPlotter::configureSettings() for ( uint i = 0; i < mBeams; ++i ) { TQStringList entry; entry << TQString::number(i); - entry << sensors().tqat( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); - entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); - entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << sensors().at( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); + entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); + entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); entry << ( mPlotter->beamColors()[ i ].name() ); list.append( entry ); @@ -214,10 +214,10 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, if ( type != "integer" && type != "float" ) return false; - if ( mBeams > 0 && hostName != sensors().tqat( 0 )->hostName() ) { + if ( mBeams > 0 && hostName != sensors().at( 0 )->hostName() ) { KMessageBox::sorry( this, TQString( "All sensors of this display need " "to be from the host %1!" ) - .arg( sensors().tqat( 0 )->hostName() ) ); + .arg( sensors().at( 0 )->hostName() ) ); /* We have to enforce this since the answers to value requests * need to be received in order. */ @@ -238,8 +238,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, TQString tooltip; for ( uint i = 0; i < mBeams; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) - .arg( sensors().tqat( mBeams - i - 1 )->name() ); + .arg( sensors().at( mBeams - i - 1 )->hostName() ) + .arg( sensors().at( mBeams - i - 1 )->name() ); } TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); @@ -263,8 +263,8 @@ bool FancyPlotter::removeSensor( uint pos ) TQString tooltip; for ( uint i = 0; i < mBeams; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) - .arg( sensors().tqat( mBeams - i - 1 )->name() ); + .arg( sensors().at( mBeams - i - 1 )->hostName() ) + .arg( sensors().at( mBeams - i - 1 )->name() ); } TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); @@ -319,7 +319,7 @@ void FancyPlotter::answerReceived( int id, const TQString &answer ) if ( info.min() == 0.0 && info.max() == 0.0 ) mPlotter->setUseAutoRange( true ); } - sensors().tqat( id - 100 )->setUnit( info.unit() ); + sensors().at( id - 100 )->setUnit( info.unit() ); } } @@ -405,9 +405,9 @@ bool FancyPlotter::saveSettings( TQDomDocument &doc, TQDomElement &element, for ( uint i = 0; i < mBeams; ++i ) { TQDomElement beam = doc.createElement( "beam" ); element.appendChild( beam ); - beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); - beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); + beam.setAttribute( "hostName", sensors().at( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().at( i )->name() ); + beam.setAttribute( "sensorType", sensors().at( i )->type() ); saveColor( beam, "color", mPlotter->beamColors()[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index c4daee1b6..c980196e6 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -239,7 +239,7 @@ ListView::addSensor(const TQString& hostName, const TQString& sensorName, const void ListView::updateList() { - sendRequest(sensors().tqat(0)->hostName(), sensors().tqat(0)->name(), 19); + sendRequest(sensors().at(0)->hostName(), sensors().at(0)->name(), 19); } void @@ -307,9 +307,9 @@ ListView::restoreSettings(TQDomElement& element) bool ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); TQColorGroup colorGroup = monitor->colorGroup(); saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index d26852230..643df8747 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -57,9 +57,9 @@ class PrivateListViewItem : public TQListViewItem public: PrivateListViewItem(PrivateListView *parent = 0); - void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { + void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) { TQColorGroup cgroup = _parent->colorGroup(); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); p->setPen(cgroup.color(TQColorGroup::Link)); p->drawLine(0, height() - 1, width - 1, height() - 1); } diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui index 53124ca65..98bf0e207 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui @@ -55,7 +55,7 @@ <property name="title"> <string>Colors</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index 9089b3b7a..7de7899ab 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -51,7 +51,7 @@ LogFile::LogFile(TQWidget *parent, const char *name, const TQString& title) LogFile::~LogFile(void) { - sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); + sendRequest(sensors().at(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); } bool @@ -64,10 +64,10 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1)); - sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); + sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); if (title.isEmpty()) - setTitle(sensors().tqat(0)->hostName() + ":" + sensorID); + setTitle(sensors().at(0)->hostName() + ":" + sensorID); else setTitle(title); @@ -206,9 +206,9 @@ LogFile::restoreSettings(TQDomElement& element) bool LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("font", monitor->font().toString()); @@ -234,8 +234,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) void LogFile::updateMonitor() { - sendRequest(sensors().tqat(0)->hostName(), - TQString("%1 %2" ).arg(sensors().tqat(0)->name()).arg(logFileID), 19); + sendRequest(sensors().at(0)->hostName(), + TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19); } void diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 9a81582e0..8a9cc9b60 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc @@ -166,9 +166,9 @@ MultiMeter::restoreSettings(TQDomElement& element) bool MultiMeter::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("showUnit", showUnit()); element.setAttribute("lowerLimitActive", (int) lowerLimitActive); element.setAttribute("lowerLimit", (int) lowerLimit); @@ -225,7 +225,7 @@ MultiMeter::applySettings() alarmDigitColor = mms->alarmDigitColor(); setBackgroundColor(mms->meterBackgroundColor()); - tqrepaint(); + repaint(); setModified(true); } @@ -234,7 +234,7 @@ MultiMeter::applyStyle() { normalDigitColor = KSGRD::Style->firstForegroundColor(); setBackgroundColor(KSGRD::Style->backgroundColor()); - tqrepaint(); + repaint(); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 16abc45c1..a04dcbb6b 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -334,14 +334,14 @@ <slot access="public" specifier="">update()</slot> <slot access="public" specifier="">update(int,int,int,int)</slot> <slot access="public" specifier="">update(const QRect&)</slot> - <slot access="public" specifier="">tqrepaint()</slot> - <slot access="public" specifier="">tqrepaint(bool)</slot> - <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot> - <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> + <slot access="public" specifier="">repaint()</slot> + <slot access="public" specifier="">repaint(bool)</slot> + <slot access="public" specifier="">repaint(int,int,int,int)</slot> + <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot> + <slot access="public" specifier="">repaint(const QRect&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 6c99f9d1d..f02b02af9 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -213,13 +213,13 @@ ProcessController::addSensor(const TQString& hostName, void ProcessController::updateList() { - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); + sendRequest(sensors().at(0)->hostName(), "ps", 2); } void ProcessController::killProcess(int pid, int sig) { - sendRequest(sensors().tqat(0)->hostName(), + sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(pid).arg(sig), 3); if ( !timerOn() ) @@ -269,7 +269,7 @@ ProcessController::killProcess() // send kill signal to all seleted processes TQValueListConstIterator<int> it; for (it = selectedPIds.begin(); it != selectedPIds.end(); ++it) - sendRequest(sensors().tqat(0)->hostName(), TQString("kill %1 %2" ).arg(*it) + sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(*it) .arg(MENU_ID_SIGKILL), 3); if ( !timerOn()) @@ -283,9 +283,9 @@ void ProcessController::reniceProcess(const TQValueList<int> &pids, int niceValue) { for( TQValueList<int>::ConstIterator it = pids.constBegin(), end = pids.constEnd(); it != end; ++it ) - sendRequest(sensors().tqat(0)->hostName(), + sendRequest(sensors().at(0)->hostName(), TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5); - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); //update the display afterwards + sendRequest(sensors().at(0)->hostName(), "ps", 2); //update the display afterwards } void @@ -401,7 +401,7 @@ ProcessController::answerReceived(int id, const TQString& answer) void ProcessController::sensorError(int, bool err) { - if (err == sensors().tqat(0)->isOk()) + if (err == sensors().at(0)->isOk()) { if (!err) { @@ -409,15 +409,15 @@ ProcessController::sensorError(int, bool err) * (re-)established we need to requests the full set of * properties again, since the back-end might be a new * one. */ - sendRequest(sensors().tqat(0)->hostName(), "test kill", 4); - sendRequest(sensors().tqat(0)->hostName(), "ps?", 1); - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); + sendRequest(sensors().at(0)->hostName(), "test kill", 4); + sendRequest(sensors().at(0)->hostName(), "ps?", 1); + sendRequest(sensors().at(0)->hostName(), "ps", 2); } /* This happens only when the sensorOk status needs to be changed. */ - sensors().tqat(0)->setIsOk( !err ); + sensors().at(0)->setIsOk( !err ); } - setSensorOk(sensors().tqat(0)->isOk()); + setSensorOk(sensors().at(0)->isOk()); } bool @@ -452,9 +452,9 @@ ProcessController::restoreSettings(TQDomElement& element) bool ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("tree", (uint) xbTreeView->isChecked()); element.setAttribute("filter", cbFilter->currentItem()); element.setAttribute("sortColumn", pList->getSortColumn()); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index bbc105f12..2f5b3fe51 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -532,8 +532,8 @@ ProcessList::deleteLeaves(void) { unsigned int i; for (i = 0; i < pl.count() && - (!isLeafProcess(pl.tqat(i)->pid()) || - matchesFilter(pl.tqat(i))); i++) + (!isLeafProcess(pl.at(i)->pid()) || + matchesFilter(pl.at(i))); i++) ; if (i == pl.count()) return; @@ -546,7 +546,7 @@ bool ProcessList::isLeafProcess(int pid) { for (unsigned int i = 0; i < pl.count(); i++) - if (pl.tqat(i)->ppid() == pid) + if (pl.at(i)->ppid() == pid) return (false); return (true); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index c4ff6a649..03ee4b991 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -219,14 +219,14 @@ void SensorDisplay::sensorError( int sensorId, bool err ) if ( sensorId >= (int)mSensors.count() || sensorId < 0 ) return; - if ( err == mSensors.tqat( sensorId )->isOk() ) { + if ( err == mSensors.at( sensorId )->isOk() ) { // this happens only when the sensorOk status needs to be changed. - mSensors.tqat( sensorId )->setIsOk( !err ); + mSensors.at( sensorId )->setIsOk( !err ); } bool ok = true; for ( uint i = 0; i < mSensors.count(); ++i ) - if ( !mSensors.tqat( i )->isOk() ) { + if ( !mSensors.at( i )->isOk() ) { ok = false; break; } @@ -524,7 +524,7 @@ void SensorDisplay::reorderSensors(const TQValueList<int> &orderOfSensors) { TQPtrList<SensorProperties> newSensors; for ( uint i = 0; i < orderOfSensors.count(); ++i ) { - newSensors.append( mSensors.tqat(orderOfSensors[i] )); + newSensors.append( mSensors.at(orderOfSensors[i] )); } mSensors.setAutoDelete( false ); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index 0e30136bf..939b66d6d 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -73,7 +73,7 @@ LogSensor::stopLogging(void) { lvi->setPixmap(0, pixmap_waiting); lvi->setTextColor(monitor->colorGroup().text()); - lvi->tqrepaint(); + lvi->repaint(); timerOff(); } @@ -105,7 +105,7 @@ LogSensor::answerReceived(int id, const TQString& answer) timerOff(); lowerLimitActive = false; lvi->setTextColor(monitor->colorGroup().foreground()); - lvi->tqrepaint(); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); timerOn(); } else if (upperLimitActive && value > upperLimit) @@ -113,7 +113,7 @@ LogSensor::answerReceived(int id, const TQString& answer) timerOff(); upperLimitActive = false; lvi->setTextColor(monitor->colorGroup().foreground()); - lvi->tqrepaint(); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h index db247238b..6630d57e1 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h @@ -44,10 +44,10 @@ public: void setTextColor(const TQColor& color) { textColor = color; } - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup cgroup(cg); cgroup.setColor(TQColorGroup::Text, textColor); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui index f253e3ecc..7a546e7b6 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui @@ -61,7 +61,7 @@ <property name="title"> <string>Colors</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 04e9e6541..3d4d9c6f6 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc @@ -134,8 +134,8 @@ void SignalPlotter::reorderBeams( const TQValueList<int>& newOrder ) for(uint i = 0; i < newOrder.count(); i++) { int newIndex = newOrder[i]; - newBeamData.append(mBeamData.tqat(newIndex)); - newBeamColor.append(*mBeamColor.tqat(newIndex)); + newBeamData.append(mBeamData.at(newIndex)); + newBeamColor.append(*mBeamColor.at(newIndex)); } mBeamData = newBeamData; mBeamColor = newBeamColor; @@ -159,7 +159,7 @@ TQValueList<TQColor> &SignalPlotter::beamColors() void SignalPlotter::removeBeam( uint pos ) { - mBeamColor.remove( mBeamColor.tqat( pos ) ); + mBeamColor.remove( mBeamColor.at( pos ) ); double *p = mBeamData.take( pos ); delete [] p; } @@ -374,7 +374,7 @@ void SignalPlotter::updateDataBuffers() memset( nd, 0, sizeof( double ) * ( newSampleNum - overlap ) ); // copy overlap from old buffer to new buffer - memcpy( nd + ( newSampleNum - overlap ), mBeamData.tqat( i ) + + memcpy( nd + ( newSampleNum - overlap ), mBeamData.at( i ) + ( mSamples - overlap ), overlap * sizeof( double ) ); double *p = mBeamData.take( i ); @@ -396,7 +396,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); pm.fill( mBackgroundColor ); /* Draw white line along the bottom and the right side of the diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index 377cc4783..119705a70 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -450,7 +450,7 @@ void WorkSheet::dropEvent( TQDropEvent *e ) * event and replace or add sensor. */ for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) - if ( mDisplayList[ r ][ c ]->tqgeometry().contains( e->pos() ) ) { + if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) { addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c ); return; } diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index 67a0ccbee..d05af4ec8 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cc @@ -122,7 +122,7 @@ const TQColor& StyleEngine::sensorColor( uint pos ) static TQColor dummy; if ( pos < mSensorColors.count() ) - return *mSensorColors.tqat( pos ); + return *mSensorColors.at( pos ); else return dummy; } diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 34f33a43d..6c7faf771 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cc @@ -162,7 +162,7 @@ void StyleSettings::setSensorColors( const TQValueList<TQColor> &list ) for ( uint i = 0; i < list.count(); ++i ) { TQPixmap pm( 12, 12 ); - pm.fill( *list.tqat( i ) ); + pm.fill( *list.at( i ) ); mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) ); } } diff --git a/kwin/client.cpp b/kwin/client.cpp index f7c2dad5e..fc989e425 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -140,7 +140,7 @@ Client::Client( Workspace *ws ) deleting = false; keep_above = FALSE; keep_below = FALSE; - is_tqshape = FALSE; + is_shape = FALSE; motif_noborder = false; motif_may_move = TRUE; motif_may_resize = TRUE; @@ -285,7 +285,7 @@ void Client::destroyClient() destroyDecoration(); cleanGrouping(); workspace()->removeClient( this, Allowed ); - client = None; // tqinvalidate + client = None; // invalidate XDestroyWindow( qt_xdisplay(), wrapper ); wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); @@ -306,7 +306,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force ) destroyDecoration(); if( !noBorder()) { - setMask( TQRegion()); // reset tqshape mask + setMask( TQRegion()); // reset shape mask decoration = workspace()->createDecoration( bridge ); // TODO check decoration's minimum size? decoration->init(); @@ -344,7 +344,7 @@ void Client::destroyDecoration() decoration = NULL; TQPoint grav = calculateGravitation( true ); border_left = border_right = border_top = border_bottom = 0; - setMask( TQRegion()); // reset tqshape mask + setMask( TQRegion()); // reset shape mask int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); @@ -515,32 +515,32 @@ bool Client::isModalSystemNotification() const void Client::updateShape() { - // workaround for #19644 - tqshaped windows shouldn't have decoration - if( tqshape() && !noBorder()) + // workaround for #19644 - shaped windows shouldn't have decoration + if( shape() && !noBorder()) { noborder = true; updateDecoration( true ); } updateOpacityCache(); - if ( tqshape() ) + if ( shape() ) { XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); setShapable(TRUE); } - // !tqshape() mask setting is done in setMask() when the decoration + // !shape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed - if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support + if( Shape::version() >= 0x11 ) // 1.1, has input shape support { // There appears to be no way to find out if a window has input - // tqshape set or not, so always propagate the input tqshape - // (it's the same like the bounding tqshape by default). - // Also, build the tqshape using a helper window, not directly - // in the frame window, because the sequence set-tqshape-to-frame, - // remove-tqshape-of-client, add-input-tqshape-of-client has the problem - // that after the second step there's a hole in the input tqshape - // until the real tqshape of the client is added and that can make + // shape set or not, so always propagate the input shape + // (it's the same like the bounding shape by default). + // Also, build the shape using a helper window, not directly + // in the frame window, because the sequence set-shape-to-frame, + // remove-shape-of-client, add-input-shape-of-client has the problem + // that after the second step there's a hole in the input shape + // until the real shape of the client is added and that can make // the window lose focus (which is a problem with mouse focus policies) static Window helper_window = None; if( helper_window == None ) @@ -571,7 +571,7 @@ void Client::setMask( const TQRegion& reg, int mode ) reg.handle(), ShapeSet ); else { - TQMemArray< TQRect > rects = reg.tqrects(); + TQMemArray< TQRect > rects = reg.rects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -874,7 +874,7 @@ void Client::setShade( ShadeMode mode ) XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it //done xcompmgr workaround -// FRAME tqrepaint( FALSE ); +// FRAME repaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = QMAX( 4, QABS( h - s.height() ) / as )+1; @@ -915,7 +915,7 @@ void Client::setShade( ShadeMode mode ) resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME tqrepaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) @@ -1078,7 +1078,7 @@ void Client::drawIntersectingShadows() { // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; // Generate list of Clients whose shadows need to be redrawn. That is, // those that are currently intersecting or intersected by other windows or @@ -1116,7 +1116,7 @@ void Client::drawOverlappingShadows(bool waitForMe) // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; stacking_order = workspace()->stackingOrder(); for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) { @@ -1167,7 +1167,7 @@ void Client::drawOverlappingShadows(bool waitForMe) /*! Draw shadow after some time has elapsed, to give recently exposed windows a - chance to tqrepaint before a shadow gradient is drawn over them. + chance to repaint before a shadow gradient is drawn over them. */ void Client::drawDelayedShadow() { @@ -1190,7 +1190,7 @@ void Client::drawShadowAfter(Client *after) void Client::drawShadow() { Window shadows[2]; - XRectangle *tqshapes; + XRectangle *shapes; int i, count, ordering; // If we are waiting for another Client's shadow to be drawn, stop waiting now @@ -1206,31 +1206,31 @@ void Client::drawShadow() * this type of window. Otherwise, drawIntersectingShadows() won't update * properly when this window is moved/resized/hidden/closed. */ - tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, + shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, &count, &ordering); - if (!tqshapes) + if (!shapes) // XShape extension not supported - tqshapeBoundingRegion = TQRegion(x(), y(), width(), height()); + shapeBoundingRegion = TQRegion(x(), y(), width(), height()); else { - tqshapeBoundingRegion = TQRegion(); + shapeBoundingRegion = TQRegion(); for (i = 0; i < count; i++) { // Translate XShaped window into a TQRegion - TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width, - tqshapes[i].height); - tqshapeBoundingRegion += tqshapeRectangle; + TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width, + shapes[i].height); + shapeBoundingRegion += shapeRectangle; } if (isShade()) // Since XResize() doesn't change a window's XShape regions, ensure that - // tqshapeBoundingRegion is not taller than the window's shaded height, + // shapeBoundingRegion is not taller than the window's shaded height, // or the bottom shadow will appear to be missing - tqshapeBoundingRegion &= TQRegion(0, 0, width(), height()); - tqshapeBoundingRegion.translate(x(), y()); + shapeBoundingRegion &= TQRegion(0, 0, width(), height()); + shapeBoundingRegion.translate(x(), y()); } if (!isShadowed() || hidden || isMinimized() || maximizeMode() == MaximizeFull || !options->shadowWindowType(windowType())) { - XFree(tqshapes); + XFree(shapes); // Tell whatever Clients are listening that this Client's shadow has been drawn. // It hasn't, but there's no sense waiting for something that won't happen. @@ -1264,9 +1264,9 @@ void Client::drawShadow() ButtonPressMask | ButtonReleaseMask | StructureNotifyMask); shadowWidget->installEventFilter(this); - if (!tqshapes) { + if (!shapes) { // XShape extension not supported - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1274,7 +1274,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else @@ -1285,7 +1285,7 @@ void Client::drawShadow() TQMemArray<TQRect>::Iterator it, itEnd; XRectangle *shadowShapes; - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1293,7 +1293,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); // XShape the shadow - exposedRects = exposedRegion.tqrects(); + exposedRects = exposedRegion.rects(); i = 0; itEnd = exposedRects.end(); shadowShapes = new XRectangle[exposedRects.count()]; @@ -1311,14 +1311,14 @@ void Client::drawShadow() delete [] shadowShapes; if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else imposeCachedShadow(shadowPixmap, exposedRegion); } - XFree(tqshapes); + XFree(shapes); // Set the background pixmap //shadowPixmap.convertFromImage(shadowImage); @@ -1391,10 +1391,10 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w, TQMemArray<TQRect>::Iterator it, itEnd; TQRegion shadowRegion; - occludedRects = occludedRegion.tqrects(); + occludedRects = occludedRegion.rects(); itEnd = occludedRects.end(); for (it = occludedRects.begin(); it != itEnd; ++it) { - // Expand each of the occluded region's tqshape rectangles to contain + // Expand each of the occluded region's shape rectangles to contain // where a shadow of the specified thickness will be drawn. Create // a new TQRegion that contains the expanded occluded region it->setTop(it->top() - thickness + yOffset); @@ -1425,7 +1425,7 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) Window rootWindow; int thickness, windowX, windowY, xOffset, yOffset; - rectangles = exposed.tqrects(); + rectangles = exposed.rects(); rootWindow = qt_xrootwin(); thickness = options->shadowThickness(isActive()); windowX = this->x(); @@ -1485,7 +1485,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, Window rootWindow; int windowX, windowY, xOffset, yOffset; - rectangles = exposed.tqrects(); + rectangles = exposed.rects(); rootWindow = qt_xrootwin(); windowX = this->x(); windowY = this->y(); @@ -2430,7 +2430,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const } /*! - Sets an appropriate cursor tqshape for the logical mouse position \a m + Sets an appropriate cursor shape for the logical mouse position \a m */ void Client::setCursor( Position m ) diff --git a/kwin/client.h b/kwin/client.h index ec94a994d..21c40afa9 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -214,8 +214,8 @@ class Client : public TQObject, public KDecorationDefines // window to be redrawn. friend void Workspace::updateOverlappingShadows(WId); - // tqshape extensions - bool tqshape() const; + // shape extensions + bool shape() const; void updateShape(); void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet ); @@ -501,7 +501,7 @@ class Client : public TQObject, public KDecorationDefines uint active :1; uint deleting : 1; // true when doing cleanup and destroying the client uint keep_above : 1; // NET::KeepAbove (was stays_on_top) - uint is_tqshape :1; + uint is_shape :1; uint skip_taskbar :1; uint original_skip_taskbar :1; // unaffected by KWin uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol? @@ -570,7 +570,7 @@ class Client : public TQObject, public KDecorationDefines TQMemArray<double> activeOpacityCache; TQMemArray<double> inactiveOpacityCache; TQMemArray<double>* opacityCache; - TQRegion tqshapeBoundingRegion; + TQRegion shapeBoundingRegion; TQTimer* shadowDelayTimer; bool shadowMe; @@ -797,9 +797,9 @@ inline bool Client::keepBelow() const return keep_below; } -inline bool Client::tqshape() const +inline bool Client::shape() const { - return is_tqshape; + return is_shape; } diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index 2135b6689..f7c41b03c 100644 --- a/kwin/clients/b2/b2client.cpp +++ b/kwin/clients/b2/b2client.cpp @@ -558,7 +558,7 @@ bool B2Client::mustDrawHandle() const void B2Client::iconChange() { if (button[BtnMenu]) - button[BtnMenu]->tqrepaint(false); + button[BtnMenu]->repaint(false); } // Gallium: New button show/hide magic for customizable @@ -607,7 +607,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/) titleMoveAbs(bar_x_ofs); doShape(); - widget()->tqrepaint(); // the frame is misrendered without this + widget()->repaint(); // the frame is misrendered without this } void B2Client::captionChange() @@ -616,7 +616,7 @@ void B2Client::captionChange() titleMoveAbs(bar_x_ofs); doShape(); titlebar->recalcBuffer(); - titlebar->tqrepaint(false); + titlebar->repaint(false); } void B2Client::paintEvent(TQPaintEvent* e) @@ -710,7 +710,7 @@ void B2Client::paintEvent(TQPaintEvent* e) visibilitinotify events until its state changes, so we just try */ if (titlebar->isFullyObscured()) { - /* We first see, if our tqrepaint contained the titlebar area */ + /* We first see, if our repaint contained the titlebar area */ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4)); reg = reg.intersect(e->region()); if (!reg.isEmpty()) @@ -815,8 +815,8 @@ void B2Client::titleMoveAbs(int new_ofs) bar_x_ofs = new_ofs; positionButtons(); doShape(); - widget()->tqrepaint(0, 0, width(), buttonSize + 4, false); - titlebar->tqrepaint(false); + widget()->repaint(0, 0, width(), buttonSize + 4, false); + titlebar->repaint(false); } } @@ -841,7 +841,7 @@ void B2Client::maximizeChange() bool m = maximizeMode() == MaximizeFull; if (button[BtnMax]) { button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX); - button[BtnMax]->tqrepaint(); + button[BtnMax]->repaint(); TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); @@ -851,13 +851,13 @@ void B2Client::maximizeChange() g->activate(); doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void B2Client::activeChange() { - widget()->tqrepaint(false); - titlebar->tqrepaint(false); + widget()->repaint(false); + titlebar->repaint(false); TQColor c = options()->colorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); @@ -865,7 +865,7 @@ void B2Client::activeChange() for (int i = 0; i < BtnCount; i++) if (button[i]) { button[i]->setBg(c); - button[i]->tqrepaint(false); + button[i]->repaint(false); } } @@ -1128,7 +1128,7 @@ void B2Client::positionButtons() // Transparent bound stuff. static TQRect *visible_bound; -static TQPointArray bound_tqshape; +static TQPointArray bound_shape; bool B2Client::drawbound(const TQRect& geom, bool clear) { @@ -1153,7 +1153,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) barLeft += 2; barRight -= 2; - bound_tqshape.putPoints(0, 8, + bound_shape.putPoints(0, 8, g.left(), frameTop, barLeft, frameTop, barLeft, g.top(), @@ -1168,7 +1168,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) TQPainter p(workspaceWidget()); p.setPen(TQPen(Qt::white, 5)); p.setRasterOp(TQt::XorROP); - p.drawPolygon(bound_tqshape); + p.drawPolygon(bound_shape); if (clear) { delete visible_bound; @@ -1273,7 +1273,7 @@ void B2Button::setPixmaps(int button_id) for (int i = 0; i < NumStates; i++) { icon[i] = B2::pixmap[button_id + i]; } - tqrepaint(false); + repaint(false); } void B2Button::mousePressEvent(TQMouseEvent * e) @@ -1297,14 +1297,14 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) void B2Button::enterEvent(TQEvent *e) { hover = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } void B2Button::leaveEvent(TQEvent *e) { hover = false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -1388,7 +1388,7 @@ void B2Titlebar::recalcBuffer() void B2Titlebar::resizeEvent(TQResizeEvent *) { recalcBuffer(); - tqrepaint(false); + repaint(false); } diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp index 987e80ee2..c3be60c80 100644 --- a/kwin/clients/default/kdedefault.cpp +++ b/kwin/clients/default/kdedefault.cpp @@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update ) || new_useGradients != useGradients || new_titleHeight != normalTitleHeight || new_toolTitleHeight != toolTitleHeight ) - changed |= SettingColors; // just recreate the pixmaps and tqrepaint + changed |= SettingColors; // just recreate the pixmaps and repaint } showGrabBar = new_showGrabBar; @@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) void KDEDefaultButton::enterEvent(TQEvent *e) { isMouseOver=true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e) void KDEDefaultButton::leaveEvent(TQEvent *e) { isMouseOver=false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -856,7 +856,7 @@ void KDEDefaultClient::init() void KDEDefaultClient::reset( unsigned long changed) { - widget()->tqrepaint(); + widget()->repaint(); KCommonDecoration::reset(changed); } diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp index 6c0b6ebe7..0c378caa7 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -784,7 +784,7 @@ void KeramikButton::enterEvent( TQEvent *e ) TQButton::enterEvent( e ); hover = true; - tqrepaint( false ); + repaint( false ); } @@ -793,7 +793,7 @@ void KeramikButton::leaveEvent( TQEvent *e ) TQButton::leaveEvent( e ); hover = false; - tqrepaint( false ); + repaint( false ); } @@ -1014,13 +1014,13 @@ void KeramikClient::reset( unsigned long ) captionBufferDirty = maskDirty = true; - // Only tqrepaint the window if it's visible + // Only repaint the window if it's visible // (i.e. not minimized and on the current desktop) if ( widget()->isVisible() ) { - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i = 0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } } @@ -1365,7 +1365,7 @@ void KeramikClient::captionChange() captionBufferDirty = true; - widget()->tqrepaint( r | captionRect, false ); + widget()->repaint( r | captionRect, false ); } @@ -1381,7 +1381,7 @@ void KeramikClient::iconChange() activeIcon = inactiveIcon = NULL; captionBufferDirty = true; - widget()->tqrepaint( captionRect, false ); + widget()->repaint( captionRect, false ); } } @@ -1400,10 +1400,10 @@ void KeramikClient::activeChange() captionBufferDirty = true; - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i=0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } @@ -1420,7 +1420,7 @@ void KeramikClient::maximizeChange() captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->tqrepaint( false ); + widget()->repaint( false ); } else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) { // We've been restored - enlarge the titlebar by 3 pixels topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -1430,14 +1430,14 @@ void KeramikClient::maximizeChange() captionBufferDirty = maskDirty = true; widget()->layout()->activate(); - widget()->tqrepaint( false ); + widget()->repaint( false ); } } if ( button[ MaxButton ] ) { TQToolTip::remove( button[ MaxButton ] ); TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") ); - button[ MaxButton ]->tqrepaint(); + button[ MaxButton ]->repaint(); } } @@ -1446,7 +1446,7 @@ void KeramikClient::desktopChange() { if ( button[ OnAllDesktopsButton ] ) { - button[ OnAllDesktopsButton ]->tqrepaint( true ); + button[ OnAllDesktopsButton ]->repaint( true ); TQToolTip::remove( button[ OnAllDesktopsButton ] ); TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") ); } @@ -1457,7 +1457,7 @@ void KeramikClient::shadeChange() { if ( button[ ShadeButton ] ) { - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); TQToolTip::remove( button[ ShadeButton ] ); TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") ); } @@ -1467,14 +1467,14 @@ void KeramikClient::shadeChange() void KeramikClient::keepAboveChange( bool ) { if ( button[ AboveButton ] ) - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::keepBelowChange( bool ) { if ( button[ BelowButton ] ) - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } @@ -1502,21 +1502,21 @@ void KeramikClient::slotMaximize() void KeramikClient::slotAbove() { setKeepAbove( !keepAbove()); - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::slotBelow() { setKeepBelow( !keepBelow()); - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } void KeramikClient::slotShade() { setShade( !isSetShade()); - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); } diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp index 56de8c9fe..abf2bad3d 100644 --- a/kwin/clients/kwmtheme/cli_installer/main.cpp +++ b/kwin/clients/kwmtheme/cli_installer/main.cpp @@ -73,36 +73,36 @@ int main(int argc, char **argv) input.setGroup("Window Border"); output->setGroup("General"); - tmpStr = input.readEntry("tqshapePixmapTop"); + tmpStr = input.readEntry("shapePixmapTop"); if(!tmpStr.isEmpty()){ copy(srcStr+tmpStr, localDirStr+tmpStr); } output->writeEntry("wm_top", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottom"); + tmpStr = input.readEntry("shapePixmapBottom"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottom", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapLeft"); + tmpStr = input.readEntry("shapePixmapLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_left", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapRight"); + tmpStr = input.readEntry("shapePixmapRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_right", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopLeft"); + tmpStr = input.readEntry("shapePixmapTopLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopRight"); + tmpStr = input.readEntry("shapePixmapTopRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topright", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomLeft"); + tmpStr = input.readEntry("shapePixmapBottomLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomRight"); + tmpStr = input.readEntry("shapePixmapBottomRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomright", tmpStr, true, true); diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 9cf70f113..89dc6a564 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest) void KWMThemeClient::resizeEvent( TQResizeEvent* ) { doShape(); - widget()->tqrepaint(); + widget()->repaint(); } void KWMThemeClient::captionChange() { - widget()->tqrepaint( titlebar->geometry(), false ); + widget()->repaint( titlebar->geometry(), false ); } void KWMThemeClient::paintEvent( TQPaintEvent *) @@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) void KWMThemeClient::doShape() { - TQBitmap tqshapemask(width(), height()); - tqshapemask.fill(color0); + TQBitmap shapemask(width(), height()); + shapemask.fill(color0); TQPainter p; - p.begin(&tqshapemask); + p.begin(&shapemask); p.setBrush(color1); p.setPen(color1); int x,y; @@ -740,14 +740,14 @@ void KWMThemeClient::doShape() } } p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1); - setMask(tqshapemask); + setMask(shapemask); } void KWMThemeClient::showEvent(TQShowEvent *) { doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp index 3b0a1c7ef..58d54a118 100644 --- a/kwin/clients/laptop/laptopclient.cpp +++ b/kwin/clients/laptop/laptopclient.cpp @@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap) deco.fill(Qt::color0); } deco.setMask(deco); - tqrepaint(); + repaint(); } void LaptopButton::drawButton(TQPainter *p) diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp index 795a384d2..d2165759d 100644 --- a/kwin/clients/plastik/plastikbutton.cpp +++ b/kwin/clients/plastik/plastikbutton.cpp @@ -140,7 +140,7 @@ void PlastikButton::animate() } } - tqrepaint(false); + repaint(false); } void PlastikButton::enterEvent(TQEvent *e) diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp index 0e72ff59c..f48417779 100644 --- a/kwin/clients/plastik/plastikclient.cpp +++ b/kwin/clients/plastik/plastikclient.cpp @@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // tqrepaint the whole thing + // repaint the whole thing clearCaptionPixmaps(); widget()->update(); updateButtons(); @@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed ) updateLayout(); - // then tqrepaint + // then repaint clearCaptionPixmaps(); widget()->update(); } diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 91ff39b7a..0435bb168 100644 --- a/kwin/clients/quartz/quartz.cpp +++ b/kwin/clients/quartz/quartz.cpp @@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap) if (bitmap) { deco = new TQBitmap(10, 10, bitmap, true); deco->setMask( *deco ); - tqrepaint( false ); + repaint( false ); } } @@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed ) { if (changed & SettingColors || changed & SettingFont) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(false); } KCommonDecoration::reset(changed); diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp index e4127adaa..790afa461 100644 --- a/kwin/clients/redmond/redmond.cpp +++ b/kwin/clients/redmond/redmond.cpp @@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p ) deco.resize(0, 0); pix = p; - tqrepaint(false); + repaint(false); } diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp index fcc3b7094..0944dce97 100644 --- a/kwin/clients/web/Web.cpp +++ b/kwin/clients/web/Web.cpp @@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type) { switch (type) { case MenuButton: - return new WebButton(MenuButton, this, "menu", tqshape_); + return new WebButton(MenuButton, this, "menu", shape_); case OnAllDesktopsButton: - return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_); + return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_); case HelpButton: - return new WebButton(HelpButton, this, "help", tqshape_); + return new WebButton(HelpButton, this, "help", shape_); case MinButton: - return new WebButton(MinButton, this, "minimize", tqshape_); + return new WebButton(MinButton, this, "minimize", shape_); case MaxButton: - return new WebButton(MaxButton, this, "maximize", tqshape_); + return new WebButton(MaxButton, this, "maximize", shape_); case CloseButton: - return new WebButton(CloseButton, this, "close", tqshape_); + return new WebButton(CloseButton, this, "close", shape_); case AboveButton: - return new WebButton(AboveButton, this, "above", tqshape_); + return new WebButton(AboveButton, this, "above", shape_); case BelowButton: - return new WebButton(BelowButton, this, "below", tqshape_); + return new WebButton(BelowButton, this, "below", shape_); case ShadeButton: - return new WebButton(ShadeButton, this, "shade", tqshape_); + return new WebButton(ShadeButton, this, "shade", shape_); default: return 0; @@ -185,7 +185,7 @@ WebClient::init() KConfig c("kwinwebrc"); c.setGroup("General"); - tqshape_ = c.readBoolEntry("Shape", true); + shape_ = c.readBoolEntry("Shape", true); KCommonDecoration::init(); } @@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(false); } else if (changed & SettingFont) { // font has changed -- update title height // title height @@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed ) if (0 != titleHeight_ % 2) titleHeight_ += 1; - widget()->tqrepaint(false); + widget()->repaint(false); } KCommonDecoration::reset(changed); @@ -241,7 +241,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.fillRect(titleRect, options()->color(ColorTitleBar, isActive())); - if (tqshape_) + if (shape_) { int r(width()); int b(height()); @@ -288,7 +288,7 @@ WebClient::paintEvent(TQPaintEvent * pe) void WebClient::updateWindowShape() { - if (!tqshape_) + if (!shape_) return; TQRegion mask(0, 0, width(), height()); diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index 565fe8125..c8a8fa2db 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -62,7 +62,7 @@ namespace Web int titleHeight_, borderSize_; - bool tqshape_; + bool shape_; TQBitmap _buttonBitmap(ButtonType t) const; }; diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp index 810d4cd7d..61811accc 100644 --- a/kwin/clients/web/WebButton.cpp +++ b/kwin/clients/web/WebButton.cpp @@ -69,10 +69,10 @@ namespace Web { 0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff }; -WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape) +WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape) : KCommonDecorationButton (type, parent, name), mouseOver_ (false), - tqshape_ (tqshape), + shape_ (shape), deco_ (parent) { setBackgroundMode(NoBackground); @@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed) WebButton::enterEvent(TQEvent * e) { mouseOver_ = true; - tqrepaint(); + repaint(); TQButton::enterEvent(e); } @@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e) WebButton::leaveEvent(TQEvent * e) { mouseOver_ = false; - tqrepaint(); + repaint(); TQButton::leaveEvent(e); } @@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p) p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); - if (tqshape_) + if (shape_) { p->drawPoint(3, 1); p->drawPoint(4, 1); @@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(4, 3); @@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p) p->setPen(Qt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); - if (tqshape_) + if (shape_) { p->drawPoint(width() - 5, 1); p->drawPoint(width() - 4, 1); @@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(width() - 5, 3); diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h index b24136868..da94ea3f7 100644 --- a/kwin/clients/web/WebButton.h +++ b/kwin/clients/web/WebButton.h @@ -41,7 +41,7 @@ namespace Web Left, Mid, Right }; - WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape); + WebButton(ButtonType type, WebClient *parent, const char *name, bool shape); virtual ~WebButton(); @@ -59,7 +59,7 @@ namespace Web bool mouseOver_; - bool tqshape_; + bool shape_; WebClient* deco_; }; } diff --git a/kwin/events.cpp b/kwin/events.cpp index 28489cc0e..5e65dbc6a 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -626,9 +626,9 @@ bool Client::windowEvent( XEvent* e ) default: if( e->xany.window == window()) { - if( e->type == Shape::tqshapeEvent() ) + if( e->type == Shape::shapeEvent() ) { - is_tqshape = Shape::hasShape( window()); // workaround for #19644 + is_shape = Shape::hasShape( window()); // workaround for #19644 updateShape(); } } diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index 8ed2e95cc..782a05e6f 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -2637,7 +2637,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent ) { clearbound(); // it's necessary to move the geometry tip when there's no outline - positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case + positionGeometryTip(); // shown, otherwise it would cause repaint problems in case drawbound( moveResizeGeom ); // they overlap; the paint event will come after this, } // so the geometry tip will be painted above the outline } diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 97e98371d..46449cf45 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton() delete m_selected; m_selected = 0; recalcItemGeometry(); - update(); // tqrepaint... + update(); // repaint... } return succ; diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index d35fbd758..c9a0174f4 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/preview.cpp @@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act } else { - TQMemArray< TQRect > rects = reg.tqrects(); + TQMemArray< TQRect > rects = reg.rects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -166,7 +166,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act delete[] xrects; } if( active ) - mask = reg; // keep tqshape of the active window for unobscuredRegion() + mask = reg; // keep shape of the active window for unobscuredRegion() } TQRect KDecorationPreview::windowGeometry( bool active ) const diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index 4ed26a9e6..f4b1fc7e8 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who Rules* ret = new Rules; if( whole_app ) { - ret->description = i18n( "Application settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) ); + ret->description = i18n( "Application settings for %1" ).arg( static_cast<const char *>(wmclass_class) ); // TODO maybe exclude some types? If yes, then also exclude them above // when searching. ret->types = NET::AllTypesMask; @@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who } return ret; } - ret->description = i18n( "Window settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) ); + ret->description = i18n( "Window settings for %1" ).arg( static_cast<const char *>(wmclass_class) ); if( type == NET::Unknown ) ret->types = NET::NormalMask; else diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index 13daabf47..1309e6267 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/killer/killer.cpp @@ -71,7 +71,7 @@ int main( int argc, char* argv[] ) "<qt>Window with title \"<b>%2</b>\" is not responding. " "This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>" "Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" ) - .tqarg( appname ).tqarg( caption ).tqarg( pid ).tqarg( static_cast<const char *>(hostname) ); + .arg( appname ).arg( caption ).arg( pid ).arg( static_cast<const char *>(hostname) ); app.updateUserTimestamp( timestamp ); if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes ) { diff --git a/kwin/layers.cpp b/kwin/layers.cpp index 7f6c90378..9684a8d35 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -87,7 +87,7 @@ void Workspace::updateClientLayer( Client* c ) if( c->layer() == c->belongsToLayer()) return; StackingUpdatesBlocker blocker( this ); - c->invalidateLayer(); // tqinvalidate, will be updated when doing restacking + c->invalidateLayer(); // invalidate, will be updated when doing restacking for( ClientList::ConstIterator it = c->transients().begin(); it != c->transients().end(); ++it ) diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp index c6f9abbbc..bd33e979f 100644 --- a/kwin/lib/kcommondecoration.cpp +++ b/kwin/lib/kcommondecoration.cpp @@ -684,7 +684,7 @@ void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/) updateWindowShape(); // FIXME: don't update() here! this would result in two paintEvent()s - // because there is already "something" else triggering the tqrepaint... + // because there is already "something" else triggering the repaint... // widget()->update(); } diff --git a/kwin/lib/kcommondecoration.h b/kwin/lib/kcommondecoration.h index a9161b762..bd55ffa0a 100644 --- a/kwin/lib/kcommondecoration.h +++ b/kwin/lib/kcommondecoration.h @@ -178,7 +178,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration /** * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * tqshaped for better usability (remember to paint these areas in paintEvent(), too). + * shaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h index dc306cde2..5f7e7fb7c 100644 --- a/kwin/lib/kdecoration.h +++ b/kwin/lib/kdecoration.h @@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration void performWindowOperation( WindowOperation op ); /** * If the decoration is non-rectangular, this function needs to be called - * to set the tqshape of the decoration. + * to set the shape of the decoration. * - * @param reg The tqshape of the decoration. + * @param reg The shape of the decoration. * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify * the sorting of the rectangles, default value is Unsorted. */ void setMask( const TQRegion& reg, int mode = 0 ); /** - * This convenience function resets the tqshape mask. + * This convenience function resets the shape mask. */ void clearMask(); // convenience /** diff --git a/kwin/lib/kdecorationfactory.h b/kwin/lib/kdecorationfactory.h index fb560c492..7396ad987 100644 --- a/kwin/lib/kdecorationfactory.h +++ b/kwin/lib/kdecorationfactory.h @@ -56,7 +56,7 @@ class KWIN_EXPORT KDecorationFactory * The argument specifies what has changed, using the SettingXXX masks. * It should be determined whether the decorations need to be completely * remade, in which case true should be returned, or whether only e.g. - * a tqrepaint will be sufficient, in which case false should be returned, + * a repaint will be sufficient, in which case false should be returned, * and resetDecorations() can be called to reset all decoration objects. * Note that true should be returned only when really necessary. */ diff --git a/kwin/manage.cpp b/kwin/manage.cpp index 48a32dad7..2c6777153 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -319,7 +319,7 @@ bool Client::manage( Window w, bool isMapped ) keepInArea( area, partial_keep_in_area ); XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask ); - is_tqshape = Shape::hasShape( window()); + is_shape = Shape::hasShape( window()); updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index e1aa9618f..0d02d3785 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -373,7 +373,7 @@ void TabBox::drawContents( TQPainter * ) pix.fill(this, 0, 0); TQPainter p; - p.tqbegin(&pix, this); + p.begin(&pix, this); TQPixmap* menu_pix = kwin_get_menu_pix_hack(); @@ -696,7 +696,7 @@ void TabBox::handleMouseEvent( XEvent* e ) if( e->type != ButtonPress ) return; TQPoint pos( e->xbutton.x_root, e->xbutton.y_root ); - if( !tqgeometry().contains( pos )) + if( !geometry().contains( pos )) { workspace()->closeTabBox(); // click outside closes tab return; diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp index ca3ce11d2..d0d165005 100644 --- a/kwin/tools/decobenchmark/main.cpp +++ b/kwin/tools/decobenchmark/main.cpp @@ -40,7 +40,7 @@ static KCmdLineOptions options[] = { { "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 }, - { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, + { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } }; @@ -117,7 +117,7 @@ int main(int argc, char** argv) Tests test; if (t == "all") test = AllTests; - else if (t == "tqrepaint") + else if (t == "repaint") test = RepaintTest; else if (t == "caption") test = CaptionTest; diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp index 4edcfa9f0..3cbcdcb5f 100644 --- a/kwin/tools/decobenchmark/preview.cpp +++ b/kwin/tools/decobenchmark/preview.cpp @@ -66,7 +66,7 @@ void KDecorationPreview::performRepaintTest(int n) deco->captionChange(); positionPreviews(0); for (int i = 0; i < n; ++i) { - deco->widget()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } @@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n) for (int i = 0; i < n; ++i) { bridge->setCaption(caption.arg(i) ); deco->captionChange(); - deco->widget()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } diff --git a/kwin/utils.cpp b/kwin/utils.cpp index de422f40e..34d29f98a 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -46,11 +46,11 @@ namespace KWinInternal // used to store the return values of // XShapeQueryExtension. -// Necessary since tqshaped window are an extension to X -int Shape::kwin_tqshape_version = 0; -int Shape::kwin_tqshape_event = 0; +// Necessary since shaped window are an extension to X +int Shape::kwin_shape_version = 0; +int Shape::kwin_shape_event = 0; -// does the window w need a tqshape combine mask around it? +// does the window w need a shape combine mask around it? bool Shape::hasShape( WId w) { int xws, yws, xbs, ybs; @@ -64,21 +64,21 @@ bool Shape::hasShape( WId w) return boundingShaped != 0; } -int Shape::tqshapeEvent() +int Shape::shapeEvent() { - return kwin_tqshape_event; + return kwin_shape_event; } void Shape::init() { - kwin_tqshape_version = 0; + kwin_shape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_tqshape_version = major * 0x10 + minor; + kwin_shape_version = major * 0x10 + minor; } void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, diff --git a/kwin/utils.h b/kwin/utils.h index 4521eeaa7..b1b2b2e2c 100644 --- a/kwin/utils.h +++ b/kwin/utils.h @@ -111,14 +111,14 @@ enum ShadeMode class Shape { public: - static bool available() { return kwin_tqshape_version > 0; } - static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits + static bool available() { return kwin_shape_version > 0; } + static int version() { return kwin_shape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); - static int tqshapeEvent(); + static int shapeEvent(); static void init(); private: - static int kwin_tqshape_version; - static int kwin_tqshape_event; + static int kwin_shape_version; + static int kwin_shape_event; }; // compile with XShape older than 1.0 diff --git a/kwin/wm-spec/x351.html b/kwin/wm-spec/x351.html index 2e827fbc1..882f63fbf 100644 --- a/kwin/wm-spec/x351.html +++ b/kwin/wm-spec/x351.html @@ -97,10 +97,10 @@ NAME="AEN356" ></H2 ><P >This spec suggests implementing the file manager desktop by mapping a -desktop-sized window (no tqshape) to all desktops, with +desktop-sized window (no shape) to all desktops, with _NET_WM_WINDOW_TYPE_DESKTOP. This makes the desktop focusable and greatly simplifies implementation of the file manager. It is also faster than -managing lots of small tqshaped windows. The file manager draws the background +managing lots of small shaped windows. The file manager draws the background on this window. There should be a root property with a window handle for use in applications that want to draw the background (xearth). </P diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index f594507f3..37a854d99 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -1056,7 +1056,7 @@ void Workspace::slotReconfigure() topmenu_selection->release(); lostTopMenuSelection(); } - topmenu_height = 0; // tqinvalidate used menu height + topmenu_height = 0; // invalidate used menu height if( managingTopMenus()) { updateTopMenuGeometry(); @@ -1938,7 +1938,7 @@ void Workspace::slotGrabWindow() int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(), ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region @@ -1956,7 +1956,7 @@ void Workspace::slotGrabWindow() //Get the masked away area. TQRegion maskedAway = bbox - contents; - TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects(); + TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); //Construct a bitmap mask from the rectangles TQBitmap mask( snapshot.width(), snapshot.height()); diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 5ea38c895..80c461c6d 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -233,7 +233,7 @@ void KNewMenu::fillMenu() if ( !bSkip ) { - Entry entry = *(s_templatesList->tqat( i-1 )); + Entry entry = *(s_templatesList->at( i-1 )); // The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template if ( (*templ).templatePath.endsWith( "emptydir" ) ) @@ -378,7 +378,7 @@ void KNewMenu::slotNewFile() emit activated(); // for KDIconView::slotNewMenuActivated() - Entry entry = *(s_templatesList->tqat( id - 1 )); + Entry entry = *(s_templatesList->at( id - 1 )); //kdDebug(1203) << TQString("sFile = %1").arg(sFile) << endl; if ( !TQFile::exists( entry.templatePath ) ) { diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc index 042cafb99..53e46bfbe 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -142,7 +142,7 @@ void KonqBgndDialog::initPictures() TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); it++ ) m_comboPicture->comboBox()->insertItem( - ( (*it).tqat(0) == '/' ) ? // if absolute path + ( (*it).at(0) == '/' ) ? // if absolute path KURL( *it ).fileName() : // then only fileName *it ); } diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 14a85fa30..702e85b83 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -301,7 +301,7 @@ void KonqDirPart::slotBackgroundSettings() m_pProps->setBgPixmapFile( dlg->pixmapFile() ); } m_pProps->applyColors( scrollWidget()->viewport() ); - scrollWidget()->viewport()->tqrepaint(); + scrollWidget()->viewport()->repaint(); } delete dlg; diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc index 1e5271123..b25b7b1c2 100644 --- a/libkonq/konq_drag.cc +++ b/libkonq/konq_drag.cc @@ -277,7 +277,7 @@ bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) else { kdDebug(1203) << "KonqDrag::decodeIsCutSelection : a=" << TQCString(a.data(), a.size() + 1) << endl; - return (a.tqat(0) == '1'); // true if 1 + return (a.at(0) == '1'); // true if 1 } } diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h index 47c3d7b35..9545c5674 100644 --- a/libkonq/konq_historymgr.h +++ b/libkonq/konq_historymgr.h @@ -327,7 +327,7 @@ protected: private slots: /** * Called by the updateTimer to emit the KParts::HistoryProvider::updated() - * signal so that khtml can tqrepaint the updated links. + * signal so that khtml can repaint the updated links. */ void slotEmitUpdated(); diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index a2aed3b82..cae8179c2 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) if (!hasPixmap && backgroundMode() != NoBackground) d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); - d->m_movie->connecStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); + d->m_movie->connectStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); d->movieFileName = d->pActiveItem->mouseOverAnimation(); d->pActiveItem->setAnimated( true ); } @@ -331,7 +331,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) else // No change in current item { // No effect. If we want to underline on hover, we should - // force the IVI to tqrepaint here, though! + // force the IVI to repaint here, though! d->pActiveItem = 0L; d->pFileTip->setItem( 0L ); } @@ -650,7 +650,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie // Disable repaints that can be triggered by ivi->setIcon(). Since icons are // resized in-place, if the icon size is increasing it can happens that the right - // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint + // or bottom icons exceed the size of the viewport.. here we prevent the repaint // event that will be triggered in that case. bool prevUpdatesState = viewport()->isUpdatesEnabled(); viewport()->setUpdatesEnabled( false ); @@ -677,7 +677,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || !stopImagePreviewFor.isEmpty() ) && autoArrange() ) - arrangeItemsInGrid( true ); // take new grid into account and tqrepaint + arrangeItemsInGrid( true ); // take new grid into account and repaint else viewport()->update(); //Repaint later.. } @@ -1249,7 +1249,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link) && ev->source() && ev->source() == viewport()) { - // First we need to call TQIconView though, to clear the drag tqshape + // First we need to call TQIconView though, to clear the drag shape bool bMovable = itemsMovable(); setItemsMovable(false); // hack ? call it what you want :-) KIconView::contentsDropEvent( ev ); @@ -1488,7 +1488,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item) y = QMAX(y, i->y() + i->height()); } - TQMemArray<TQRect> rects = r.tqrects(); + TQMemArray<TQRect> rects = r.rects(); TQMemArray<TQRect>::Iterator it = rects.begin(); bool foundPlace = FALSE; for (; it != rects.end(); ++it) @@ -1730,12 +1730,12 @@ void KonqIconViewWidget::lineupIcons() } } - // tqrepaint + // repaint if ( newItemWidth ) updateContents(); else { // Repaint only repaintRegion... - TQMemArray<TQRect> rects = repaintRegion.tqrects(); + TQMemArray<TQRect> rects = repaintRegion.rects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; @@ -1794,7 +1794,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) } // Repaint only repaintRegion... - TQMemArray<TQRect> rects = repaintRegion.tqrects(); + TQMemArray<TQRect> rects = repaintRegion.rects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index fbb16cf72..a23ea3ff6 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -70,9 +70,9 @@ TQString KonqPixmapProvider::iconNameFor( const TQString& url ) else { KURL u; - if ( url.tqat(0) == '~' ) + if ( url.at(0) == '~' ) u.setPath( KShell::tildeExpand( url ) ); - else if ( url.tqat(0) == '/' ) + else if ( url.at(0) == '/' ) u.setPath( url ); else u = url; @@ -166,7 +166,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon return SmallIcon( icon, size ); KURL u; - if ( url.tqat(0) == '/' ) + if ( url.at(0) == '/' ) u.setPath( url ); else u = url; diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index db7e214ec..5949fe461 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -130,7 +130,7 @@ void NSPluginInstance::windowChanged(WId w) setBackgroundMode(w == 0 ? TQWidget::PaletteBackground : TQWidget::NoBackground); if (w == 0) { // FIXME: Put a notice here to tell the user that it crashed. - tqrepaint(); + repaint(); } } diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index b48d2a8b6..6914deb93 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -346,7 +346,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, // open the library and ask for the mimetype kdDebug(1433) << " - opening " << absFile << endl; - cache.tqdevice()->flush(); + cache.device()->flush(); // fork, so that a crash in the plugin won't stop the scanning of other plugins int pipes[2]; if (pipe(pipes) != 0) continue; diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h index 06a8e1ee6..45f3f0a9a 100644 --- a/nsplugins/sdk/npruntime.h +++ b/nsplugins/sdk/npruntime.h @@ -306,7 +306,7 @@ typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj, NPInvalidateFunctionPtr is called by the scripting environment when the native code is shutdown. Any attempt to message a - NPObject instance after the tqinvalidate callback has been + NPObject instance after the invalidate callback has been called will result in undefined behavior, even if the native code is still retaining those NPObject instances. (The runtime will typically return immediately, with 0 or NULL, from an attempt @@ -318,7 +318,7 @@ struct NPClass uint32_t structVersion; NPAllocateFunctionPtr allocate; NPDeallocateFunctionPtr deallocate; - NPInvalidateFunctionPtr tqinvalidate; + NPInvalidateFunctionPtr invalidate; NPHasMethodFunctionPtr hasMethod; NPInvokeFunctionPtr invoke; NPInvokeDefaultFunctionPtr invokeDefault; diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 146604c22..310210c66 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -138,7 +138,7 @@ void g_NPN_ForceRedraw(NPP /*instance*/) } -// tqinvalidate rect +// invalidate rect void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api7.html#999503 @@ -147,7 +147,7 @@ void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) } -// tqinvalidate region +// invalidate region void g_NPN_InvalidateRegion(NPP /*instance*/, NPRegion /*invalidRegion*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api8.html#999528 diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index ba9a23886..e15b52eb0 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -190,7 +190,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable ) } #endif if ( p ) - _notifiers[type].insert( _notifiers[type].tqat(), sn ); + _notifiers[type].insert( _notifiers[type].at(), sn ); else _notifiers[type].append( sn ); } diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index ff079c736..57b04138a 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -57,8 +57,8 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, KWin::setState( w->winId(), NET::Modal ); KWin::WindowInfo info = KWin::windowInfo( parent, (unsigned long)NET::WMGeometry ); if( info.valid()) - w->move( info.tqgeometry().x() + ( info.tqgeometry().width() - w->width())/2, - info.tqgeometry().y() + ( info.tqgeometry().height()- w->height())/2 ); + w->move( info.geometry().x() + ( info.geometry().width() - w->width())/2, + info.geometry().y() + ( info.geometry().height()- w->height())/2 ); } // duped in qtkde |