diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
| commit | cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch) | |
| tree | 2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 | |
| parent | 107dd1f98367d07df7cbe2042786511e44706d3a (diff) | |
| download | tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip | |
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
179 files changed, 851 insertions, 812 deletions
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index dcdab5f80..eea44645e 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.at(i)->plugin == plugin ) + if ( pluginPages.tqat(i)->plugin == plugin ) { - TQWidget *w = pluginPages.at(i)->page->tqparentWidget(); - delete pluginPages.at(i)->page; + TQWidget *w = pluginPages.tqat(i)->page->tqparentWidget(); + delete pluginPages.tqat(i)->page; delete w; - pluginPages.remove(pluginPages.at(i)); + pluginPages.remove(pluginPages.tqat(i)); i--; } } @@ -415,7 +415,7 @@ void KateConfigDialog::slotApply() // for (uint i=0; i<editorPages.count(); i++) { - editorPages.at(i)->apply(); + editorPages.tqat(i)->apply(); } v->getDoc()->writeConfig(config); @@ -425,7 +425,7 @@ void KateConfigDialog::slotApply() // for (uint i=0; i<pluginPages.count(); i++) { - pluginPages.at(i)->page->apply(); + pluginPages.tqat(i)->page->apply(); } config->sync(); diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 8041d5910..3dcde4490 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text ) if (!m_part) return; - TerminalInterface *t = static_cast<TerminalInterface*>( m_part->tqqt_cast( "TerminalInterface" ) ); + TerminalInterface *t = static_cast<TerminalInterface*>( m_part->qt_cast( "TerminalInterface" ) ); if (!t) return; diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index c06aa7ead..7674935b4 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.at(0)->writeConfig(KateApp::self()->config()); + m_docList.tqat(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.at(n); + return m_docList.tqat(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().at(0)->isModified() && documentList().at(0)->url().isEmpty())) + if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().tqat(0)->isModified() && documentList().tqat(0)->url().isEmpty())) { Kate::Document* doc = documentList().getFirst(); @@ -354,7 +354,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL) } while (!docs.isEmpty() && res) - if (! closeDocument(docs.at(0),closeURL) ) + if (! closeDocument(docs.tqat(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()->at(s)->activateView (m_docList.at(0)->documentNumber()); + KateApp::self()->mainWindow(i)->viewManager()->containers()->tqat(s)->activateView (m_docList.tqat(0)->documentNumber()); } return res; diff --git a/kate/app/katedocmanageriface.cpp b/kate/app/katedocmanageriface.cpp index 64d9d558a..5ef01a1df 100644 --- a/kate/app/katedocmanageriface.cpp +++ b/kate/app/katedocmanageriface.cpp @@ -35,7 +35,7 @@ DCOPRef KateDocManagerDCOPIface::document (uint n) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject")); + DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument () if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject")); + DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject")); + DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -90,7 +90,7 @@ DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject")); + DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject")); if (!obj) return DCOPRef (); diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index a7b1f2afd..1a2d60a53 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -186,12 +186,12 @@ void KateExternalToolsCommand::reload () { } bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) { - TQWidget *wv=dynamic_cast<TQWidget*>(view); + TQWidget *wv=tqt_dynamic_cast<TQWidget*>(view); if (!wv) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl; return false; } - KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget()); + KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget()); if (!dmw) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl; return false; @@ -201,7 +201,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt if (actionName.isEmpty()) return false; // kdDebug(13001)<<"actionName is not empty:"<<actionName<<endl; KateExternalToolsMenuAction *a= - dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external")); + tqt_dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external")); if (!a) return false; // kdDebug(13001)<<"trying to find action"<<endl; KAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8())); @@ -390,7 +390,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged() KActionPtrList actions = m_actionCollection->actions(); for (KActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it ) { - KateExternalToolAction *action = dynamic_cast<KateExternalToolAction*>(*it); + KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it); if ( action ) { l = action->tool->mimetypes; diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 11561e5fd..a45e8a107 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.at( i )->setEditHistPos( i+1 ); - tqrepaintItem( m_editHistory.at( i ) ); + m_editHistory.tqat( i )->setEditHistPos( i+1 ); + tqrepaintItem( m_editHistory.tqat( i ) ); } } else @@ -342,8 +342,8 @@ void KateFileList::slotViewChanged () for ( uint i=0; i < m_viewHistory.count(); i++ ) { - m_viewHistory.at( i )->setViewHistPos( i+1 ); - tqrepaintItem( m_viewHistory.at( i ) ); + m_viewHistory.tqat( i )->setViewHistPos( i+1 ); + tqrepaintItem( m_viewHistory.tqat( i ) ); } } diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index bb6d26f5a..9b3c7602d 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.at(i)->reloadXML(); - TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document + l.tqat(i)->reloadXML(); + TQPtrList<class KTextEditor::View> l1=l.tqat(i)->views ();//KTextEditor::Document for (uint i1=0;i1<l1.count();i1++) { - l1.at(i1)->reloadXML(); + l1.tqat(i1)->reloadXML(); // kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl; } } diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 9dcb5769d..c01d9c137 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -239,7 +239,7 @@ ToolView::~ToolView () m_mainWin->toolViewDeleted (this); } -void ToolView::setVisible (bool vis) +void ToolView::tqsetVisible (bool vis) { if (m_visible == vis) return; @@ -256,8 +256,9 @@ bool ToolView::visible () const void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget")) - setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget"))); + if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->qt_cast("TQWidget")) { + setFocusProxy (::tqqt_cast<QWidget*>(TQT_TQOBJECT(ev->child()))); +} TQVBox::childEvent (ev); } @@ -379,7 +380,7 @@ bool Sidebar::showWidget (ToolView *widget) { it.current()->hide(); setTab (it.currentKey(), false); - it.current()->setVisible(false); + it.current()->tqsetVisible(false); } setTab (m_widgetToId[widget], true); @@ -387,7 +388,7 @@ bool Sidebar::showWidget (ToolView *widget) m_ownSplit->show (); widget->show (); - widget->setVisible (true); + widget->tqsetVisible (true); return true; } @@ -419,7 +420,7 @@ bool Sidebar::hideWidget (ToolView *widget) if (!anyVis) m_ownSplit->hide (); - widget->setVisible (false); + widget->tqsetVisible (false); return true; } @@ -448,7 +449,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) if (ev->type()==TQEvent::ContextMenu) { TQContextMenuEvent *e = (TQContextMenuEvent *) ev; - KMultiTabBarTab *bt = dynamic_cast<KMultiTabBarTab*>(obj); + KMultiTabBarTab *bt = tqt_dynamic_cast<KMultiTabBarTab*>(obj); if (bt) { kdDebug()<<"Request for popup"<<endl; @@ -617,7 +618,7 @@ void Sidebar::restoreSession (KConfig *config) ToolView *tv = m_toolviews[i]; tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false); - tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false)); + tv->tqsetVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false)); if (!anyVis) anyVis = tv->visible(); diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index a4baf6b16..97a8887e6 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -41,6 +41,7 @@ namespace KateMDI { class Splitter : public TQSplitter { Q_OBJECT + TQ_OBJECT public: Splitter(Orientation o, TQWidget* parent=0, const char* name=0); @@ -60,6 +61,7 @@ class Splitter : public TQSplitter class ToggleToolViewAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: ToggleToolViewAction ( const TQString& text, const KShortcut& cut, @@ -78,6 +80,7 @@ class ToggleToolViewAction : public KToggleAction class GUIClient : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: GUIClient ( class MainWindow *mw ); @@ -102,6 +105,7 @@ class GUIClient : public TQObject, public KXMLGUIClient class ToolView : public TQVBox { Q_OBJECT + TQ_OBJECT friend class Sidebar; friend class MainWindow; @@ -142,7 +146,7 @@ class ToolView : public TQVBox Sidebar *sidebar () { return m_sidebar; } - void setVisible (bool vis); + void tqsetVisible (bool vis); public: bool visible () const; @@ -176,6 +180,7 @@ class ToolView : public TQVBox class Sidebar : public KMultiTabBar { Q_OBJECT + TQ_OBJECT public: Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, TQWidget *parent); @@ -248,6 +253,7 @@ class Sidebar : public KMultiTabBar class MainWindow : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT friend class ToolView; diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index 09257300c..6e0d28a1d 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.at(i)); + new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.tqat(i)); } m_documentRoot->setOpen(true); } else m_documentRoot=0; diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 0789f0502..b7cb1f360 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions () } void KateViewManager::tabChanged(TQWidget* widget) { - KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->tqqt_cast("KateViewSpaceContainer")); + KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->qt_cast("KateViewSpaceContainer")); Q_ASSERT(container); m_currentContainer=container; @@ -316,7 +316,7 @@ uint KateViewManager::viewCount () { uint viewCount=0; for (uint i=0;i<m_viewSpaceContainerList.count();i++) { - viewCount+=m_viewSpaceContainerList.at(i)->viewCount(); + viewCount+=m_viewSpaceContainerList.tqat(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.at(i)->viewSpaceCount(); + viewSpaceCount+=m_viewSpaceContainerList.tqat(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.at(i)->m_blockViewCreationAndActivation=block; + m_viewSpaceContainerList.tqat(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.at(i)->closeViews(documentNumber); + m_viewSpaceContainerList.tqat(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.at(i)->setShowFullPath(enable); + m_viewSpaceContainerList.tqat(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.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); + m_viewSpaceContainerList.tqat(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.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:")); + m_viewSpaceContainerList.tqat(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:")); for (uint i=1;i<tabCount;i++) { slotNewTab(); - m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i)); + m_viewSpaceContainerList.tqat(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 98513a222..58686a45c 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -277,7 +277,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view ) setActiveView (view); m_viewList.tqfindRef (view); - mainWindow()->toolBar ()->setUpdatesEnabled (false); + mainWindow()->toolBar ()->tqsetUpdatesEnabled (false); if (m_viewManager->guiMergedView) mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView ); @@ -287,7 +287,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view ) if (!m_blockViewCreationAndActivation) mainWindow()->guiFactory ()->addClient( view ); - mainWindow()->toolBar ()->setUpdatesEnabled (true); + mainWindow()->toolBar ()->tqsetUpdatesEnabled (true); statusMsg(); @@ -342,8 +342,8 @@ void KateViewSpaceContainer::activateNextView() if (i >= m_viewSpaceList.count()) i=0; - setActiveSpace (m_viewSpaceList.at(i)); - activateView(m_viewSpaceList.at(i)->currentView()); + setActiveSpace (m_viewSpaceList.tqat(i)); + activateView(m_viewSpaceList.tqat(i)->currentView()); } void KateViewSpaceContainer::activatePrevView() @@ -353,8 +353,8 @@ void KateViewSpaceContainer::activatePrevView() if (i < 0) i=m_viewSpaceList.count()-1; - setActiveSpace (m_viewSpaceList.at(i)); - activateView(m_viewSpaceList.at(i)->currentView()); + setActiveSpace (m_viewSpaceList.tqat(i)); + activateView(m_viewSpaceList.tqat(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.at(z); + Kate::View* current = m_viewList.tqat(z); if ( current->getDoc()->documentNumber() == documentNumber ) { closeList.append (current); @@ -450,7 +450,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, TQValueList<int> psizes; if ( ! isFirstTime ) - if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->tqqt_cast("TQSplitter")) ) + if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; @@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, s->moveToFirst( vsNew ); if (!isFirstTime) - if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->tqqt_cast("TQSplitter")) ) + if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) ) ps->setSizes( psizes ); s->show(); @@ -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.at(i)); + mainWindow()->guiFactory ()->removeClient (m_viewList.tqat(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.at( config->readNumEntry("Active ViewSpace") ); + KateViewSpace *vs = m_viewSpaceList.tqat( config->readNumEntry("Active ViewSpace") ); if ( vs ) activateSpace( vs->currentView() ); */ diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 5494b4149..947f97067 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -107,8 +107,8 @@ KWrite::KWrite (KTextEditor::Document *doc) guiFactory()->addClient( m_view ); // install a working kate part popup dialog thingy - if (static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View"))) - static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + if (static_cast<Kate::View*>(m_view->qt_cast("Kate::View"))) + static_cast<Kate::View*>(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) @@ -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.at(z - 1); + KTextEditor::Document *doc = docList.tqat(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.tqfind(winList.at(z-1)->view()->document()) + 1); + config->writeEntry("DocumentNumber",docList.tqfind(winList.tqat(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.at(config->readNumEntry("DocumentNumber") - 1)); + t = new KWrite(docList.tqat(config->readNumEntry("DocumentNumber") - 1)); t->restore(config,z); } } diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h index 6a3565a6c..0e56cb2a6 100644 --- a/kate/app/kwritemain.h +++ b/kate/app/kwritemain.h @@ -38,6 +38,7 @@ class KRecentFilesAction; class KWrite : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: KWrite(KTextEditor::Document * = 0L); @@ -122,6 +123,7 @@ class KWrite : public KParts::MainWindow class KWriteEditorChooser: public KDialogBase { Q_OBJECT + TQ_OBJECT public: KWriteEditorChooser(TQWidget *parent); diff --git a/kate/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index 45c0b8f35..849b12a1e 100644 --- a/kate/interfaces/plugin.cpp +++ b/kate/interfaces/plugin.cpp @@ -99,7 +99,7 @@ PluginViewInterface *pluginViewInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast<PluginViewInterface*>(plugin->tqqt_cast("Kate::PluginViewInterface")); + return static_cast<PluginViewInterface*>(plugin->qt_cast("Kate::PluginViewInterface")); } } diff --git a/kate/interfaces/pluginconfiginterface.cpp b/kate/interfaces/pluginconfiginterface.cpp index 66afe4d7c..594b73e5d 100644 --- a/kate/interfaces/pluginconfiginterface.cpp +++ b/kate/interfaces/pluginconfiginterface.cpp @@ -59,5 +59,5 @@ PluginConfigInterface *Kate::pluginConfigInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast<PluginConfigInterface*>(plugin->tqqt_cast("Kate::PluginConfigInterface")); + return static_cast<PluginConfigInterface*>(plugin->qt_cast("Kate::PluginConfigInterface")); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.cpp b/kate/interfaces/pluginconfiginterfaceextension.cpp index d09996b8e..53c22122b 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.cpp +++ b/kate/interfaces/pluginconfiginterfaceextension.cpp @@ -64,5 +64,5 @@ PluginConfigInterfaceExtension *Kate::pluginConfigInterfaceExtension (Plugin *pl if (!plugin) return 0; - return static_cast<PluginConfigInterfaceExtension*>(plugin->tqqt_cast("Kate::PluginConfigInterfaceExtension")); + return static_cast<PluginConfigInterfaceExtension*>(plugin->qt_cast("Kate::PluginConfigInterfaceExtension")); } diff --git a/kate/interfaces/toolviewmanager.cpp b/kate/interfaces/toolviewmanager.cpp index 3d8b0a9db..848ec5fa2 100644 --- a/kate/interfaces/toolviewmanager.cpp +++ b/kate/interfaces/toolviewmanager.cpp @@ -60,7 +60,7 @@ TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewM bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position pos) { - if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) + if (!widget || !widget->qt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->moveToolView (static_cast<KateMDI::ToolView*>(widget), (KMultiTabBar::KMultiTabBarPosition)pos); @@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position bool ToolViewManager::showToolView(TQWidget *widget) { - if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) + if (!widget || !widget->qt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->showToolView (static_cast<KateMDI::ToolView*>(widget)); @@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget) bool ToolViewManager::hideToolView(TQWidget *widget) { - if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) + if (!widget || !widget->qt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->hideToolView (static_cast<KateMDI::ToolView*>(widget)); diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 8239d2997..88c8e7fe9 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -297,7 +297,7 @@ void KArtsModule::load( bool useDefaults ) { if(a->name == audioIO) // first item: "autodetect" { - hardware->audioIO->setCurrentItem(audioIOList.at() + 1); + hardware->audioIO->setCurrentItem(audioIOList.tqat() + 1); break; } @@ -334,7 +334,7 @@ void KArtsModule::saveParams( void ) int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { - audioIO = audioIOList.at(item)->name; + audioIO = audioIOList.tqat(item)->name; } TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null; @@ -498,7 +498,7 @@ void KArtsModule::updateWidgets() int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { - audioIO = audioIOList.at(item)->name; + audioIO = audioIOList.tqat(item)->name; bool jack = (audioIO == TQString::tqfromLatin1("jack")); if(jack) { diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 1683b49a0..6548b066d 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -148,7 +148,7 @@ bool KBackgroundPattern::isAvailable() if (m_Pattern.isEmpty()) return false; TQString file = m_Pattern; - if (file.at(0) != '/') + if (file.tqat(0) != '/') file = m_pDirs->findResource("dtop_pattern", file); TQFileInfo fi(file); return (fi.exists()); @@ -895,7 +895,7 @@ void KBackgroundSettings::randomizeWallpaperFiles() tmpList.pop_front(); while(tmpList.count()) { - randomList.insert(randomList.at( + randomList.insert(randomList.tqat( rseq.getLong(randomList.count()+1)), 1, tmpList.front()); @@ -985,7 +985,7 @@ bool KBackgroundSettings::discardCurrentWallpaper() { return false; } - m_WallpaperFiles.remove(m_WallpaperFiles.at(m_CurrentWallpaper)); + m_WallpaperFiles.remove(m_WallpaperFiles.tqat(m_CurrentWallpaper)); --m_CurrentWallpaper; changeWallpaper(); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 10d774da7..fd2aaafb3 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -74,7 +74,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): box->setColumnLayout( 0, Qt::Horizontal ); layout->addWidget(box); layout->addStretch(); - TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint()); grid->setColStretch(0, 0); grid->setColStretch(1, 1); grid->addColSpacing(0, 30); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 39c1d55b9..38a4ea444 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -440,7 +440,7 @@ void KColorScheme::sliderValueChanged( int val ) void KColorScheme::slotSave( ) { - KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes); if (!entry) return; sCurrentScheme = entry->path; KSimpleConfig *config = new KSimpleConfig(sCurrentScheme ); @@ -482,7 +482,7 @@ void KColorScheme::slotSave( ) void KColorScheme::slotRemove() { uint ind = sList->currentItem(); - KColorSchemeEntry *entry = mSchemeList->at(ind-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->tqat(ind-nSysSchemes); if (!entry) return; if (unlink(TQFile::encodeName(entry->path).data())) { @@ -497,7 +497,7 @@ void KColorScheme::slotRemove() mSchemeList->remove(entry); ind = sList->currentItem(); - entry = mSchemeList->at(ind-nSysSchemes); + entry = mSchemeList->tqat(ind-nSysSchemes); if (!entry) return; removeBt->setEnabled(entry ? entry->local : false); } @@ -795,7 +795,7 @@ void KColorScheme::readScheme( int index ) config->setGroup("General"); } else { // Open scheme file - KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->tqat(sList->currentItem()-nSysSchemes); if (!entry) return; sCurrentScheme = entry->path; config = new KSimpleConfig(sCurrentScheme, true); @@ -941,7 +941,7 @@ void KColorScheme::slotPreviewScheme(int indx) removeBt->setEnabled(false); else { - KColorSchemeEntry *entry = mSchemeList->at(indx-nSysSchemes); + KColorSchemeEntry *entry = mSchemeList->tqat(indx-nSysSchemes); removeBt->setEnabled(entry ? entry->local : false); } diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index abe1e5c74..403219de8 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -417,7 +417,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { TQWidget *newConfigWidget = 0; if (cfgType.isEmpty() || (cfgType=="component")) { - if (!(configWidget && configWidget->tqqt_cast("CfgComponent"))) + if (!(configWidget && configWidget->qt_cast("CfgComponent"))) { CfgComponent* cfgcomp = new CfgComponent(configContainer); cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text())); @@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_email") { - if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient"))) + if (!(configWidget && configWidget->qt_cast("CfgEmailClient"))) { newConfigWidget = new CfgEmailClient(configContainer); } @@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_terminal") { - if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator"))) + if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator"))) { newConfigWidget = new CfgTerminalEmulator(configContainer); } @@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_browser") { - if (!(configWidget && configWidget->tqqt_cast("CfgBrowser"))) + if (!(configWidget && configWidget->qt_cast("CfgBrowser"))) { newConfigWidget = new CfgBrowser(configContainer); } @@ -465,7 +465,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } if (configWidget) - static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg); + static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg); emitChanged(false); latestEditedService=static_cast<MyListBoxItem*>(it)->File; @@ -487,7 +487,7 @@ void ComponentChooser::load() { if( configWidget ) { CfgPlugin * plugin = static_cast<CfgPlugin*>( - configWidget->tqqt_cast( "CfgPlugin" ) ); + configWidget->qt_cast( "CfgPlugin" ) ); if( plugin ) { KSimpleConfig cfg(latestEditedService); @@ -500,7 +500,7 @@ void ComponentChooser::save() { if( configWidget ) { CfgPlugin * plugin = static_cast<CfgPlugin*>( - configWidget->tqqt_cast( "CfgPlugin" ) ); + configWidget->qt_cast( "CfgPlugin" ) ); if( plugin ) { KSimpleConfig cfg(latestEditedService); @@ -512,7 +512,7 @@ void ComponentChooser::save() { void ComponentChooser::restoreDefault() { if (configWidget) { - static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults(); + static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults(); emitChanged(true); } diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index b082cf1fa..481ae9c7f 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -688,7 +688,7 @@ void KFonts::load() void KFonts::load( bool useDefaults ) { for ( uint i = 0; i < fontUseList.count(); i++ ) - fontUseList.at( i )->readFont( useDefaults ); + fontUseList.tqat( i )->readFont( useDefaults ); useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled; cbAA->setCurrentItem( useAA ); @@ -779,7 +779,7 @@ void KFonts::slotApplyFontDiff() if (ret == KDialog::Accepted && fontDiffFlags) { for ( int i = 0; i < (int) fontUseList.count(); i++ ) - fontUseList.at( i )->applyFontDiff( font,fontDiffFlags ); + fontUseList.tqat( i )->applyFontDiff( font,fontDiffFlags ); emit changed(true); } } diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index e78a70af2..6556b912d 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -286,7 +286,7 @@ void KICCConfig::load(bool useDefaults ) base->deleteProfileButton->setFixedWidth(90); XRROutputInfo *output_info; - KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI(); + KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); config->setReadDefaults( useDefaults ); @@ -356,7 +356,7 @@ void KICCConfig::save() { int i; int j; - KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI(); + KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); // Write system configuration systemconfig->setGroup(NULL); @@ -408,4 +408,4 @@ TQString KICCConfig::quickHelp() const " for a more lifelike and vibrant image."); } -#include "iccconfig.moc"
\ No newline at end of file +#include "iccconfig.moc" diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am index 7a852aa3e..7ac995b97 100644 --- a/kcontrol/input/Makefile.am +++ b/kcontrol/input/Makefile.am @@ -16,7 +16,7 @@ bin_PROGRAMS = kapplymousetheme kapplymousetheme_SOURCES = kapplymousetheme.cpp kapplymousetheme_LDFLAGS = $(all_libraries) -kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) +kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) $(LIB_QT) kde_module_LTLIBRARIES = kcm_input.la diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index e0b33cf1b..17bf227f4 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget() void PreviewWidget::setTheme( const TQString &theme ) { - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); int minHeight = previewSize + 20; // Minimum height of the preview widget int maxHeight = height(); // Tallest cursor height @@ -302,7 +302,7 @@ void PreviewWidget::setTheme( const TQString &theme ) current = -1; setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) ); - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); tqrepaint( false ); } diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index f3b80bda0..dde14168b 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -256,7 +256,12 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, ProxyWidget::~ProxyWidget() { - delete _client; +#ifdef USE_QT4 + #warning Possible memory leak in ProxyWidget::~ProxyWidget() +#else // USE_QT4 + if (_client) delete _client; + _client = 0; +#endif // USE_QT4 } TQString ProxyWidget::quickHelp() const diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index 90631e3bf..103a2f33b 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) loadLanguageList(langcombo); connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); label = new TQLabel(langcombo, i18n("Languag&e:"), group); - TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); + TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); hbox->setColStretch(1, 1); hbox->addWidget(label, 1, 0); hbox->addWidget(langcombo, 1, 1); diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 0bd08b1fd..239873a24 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -238,7 +238,7 @@ void KKeyModule::defaults() uint ind = sList->currentItem(); - if ( !d.remove( *sFileList->at( ind ) ) ) { + if ( !d.remove( *sFileList->tqat( ind ) ) ) { KMessageBox::sorry( 0, i18n("This key scheme could not be removed.\n" "Perhaps you do not have permission to alter the file " @@ -247,7 +247,7 @@ void KKeyModule::defaults() } sList->removeItem( ind ); - sFileList->remove( sFileList->at(ind) ); + sFileList->remove( sFileList->tqat(ind) ); }*/ void KKeyModule::slotKeyChange() @@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange() /*void KKeyModule::slotSave( ) { - KSimpleConfig config(*sFileList->at( sList->currentItem() ) ); + KSimpleConfig config(*sFileList->tqat( sList->currentItem() ) ); // global=true is necessary in order to // let both 'Global Shortcuts' and 'Shortcut Sequences' be // written to the same scheme file. @@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index ) else { KConfigBase* config = 0; if( index == 0 ) config = new KConfig( "kdeglobals" ); - //else config = new KSimpleConfig( *sFileList->at( index ), true ); + //else config = new KSimpleConfig( *sFileList->tqat( index ), true ); actions.readActions( (index == 0) ? KeySet : KeyScheme, config ); kc->listSync(); @@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index ) // Set various appropriate for the scheme if ( indx < nSysSchemes || - (*sFileList->at(indx)).tqcontains( "/global-" ) || - (*sFileList->at(indx)).tqcontains( "/app-" ) ) { + (*sFileList->tqat(indx)).tqcontains( "/global-" ) || + (*sFileList->tqat(indx)).tqcontains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index ab84300d4..3a03c4d69 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -241,9 +241,9 @@ void DesktopBehavior::setMediaListViewEnabled(bool enabled) it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling())) { if (it->mimeType().startsWith("media/builtin-") == false) - it->setVisible(enabled); + it->tqsetVisible(enabled); else - it->setVisible(TRUE); + it->tqsetVisible(TRUE); } } diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index a2c7ceb53..4927eda48 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -38,7 +38,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, setColumnLayout(0, Qt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); - TQGridLayout* thisLayout = new TQGridLayout(layout()); + TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); thisLayout->tqsetAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index eeedca18a..88baa1103 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -135,7 +135,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, setColumnLayout(0, Qt::Vertical); layout()->setSpacing(0); layout()->setMargin(0); - TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); + TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); this_layout->tqsetAlignment(Qt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index e93084af1..188b0c910 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -340,8 +340,8 @@ void SessionEditor::saveCurrent() else co->writeEntry("Font",fontCombo->currentItem()-1); co->writeEntry("Term",termLine->text()); - co->writeEntry("KeyTab",*keytabFilename.at(keytabCombo->currentItem())); - co->writeEntry("Schema",*schemaFilename.at(schemaCombo->currentItem())); + co->writeEntry("KeyTab",*keytabFilename.tqat(keytabCombo->currentItem())); + co->writeEntry("Schema",*schemaFilename.tqat(schemaCombo->currentItem())); co->sync(); delete co; sesMod=false; diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index ba6193107..f73303bc0 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "given in the section 'Startup indication timeout'")); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->layout()->setSpacing( 0 ); - GroupBox1->layout()->setMargin( 0 ); + GroupBox1->tqlayout()->setSpacing( 0 ); + GroupBox1->tqlayout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox1 ); - TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 ); + TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); GroupBox1Layout->setColStretch( 1, 1 ); @@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "given in the section 'Startup indication timeout'")); GroupBox2->setColumnLayout( 0, Qt::Vertical ); - GroupBox2->layout()->setSpacing( 0 ); - GroupBox2->layout()->setMargin( 0 ); + GroupBox2->tqlayout()->setSpacing( 0 ); + GroupBox2->tqlayout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox2 ); - TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 ); + TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 ); GroupBox2Layout->setSpacing( 6 ); GroupBox2Layout->setMargin( 11 ); GroupBox2Layout->setColStretch( 1, 1 ); diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index a192bf608..81b899caa 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -174,12 +174,12 @@ void KLocaleConfig::slotAddLanguage(const TQString & code) // If it's already in list, just move it (delete the old, then insert a new) int oldPos = languageList.tqfindIndex( code ); if ( oldPos != -1 ) - languageList.remove( languageList.at(oldPos) ); + languageList.remove( languageList.tqat(oldPos) ); if ( oldPos != -1 && oldPos < pos ) --pos; - TQStringList::Iterator it = languageList.at( pos ); + TQStringList::Iterator it = languageList.tqat( pos ); languageList.insert( it, code ); @@ -195,7 +195,7 @@ void KLocaleConfig::slotRemoveLanguage() TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - TQStringList::Iterator it = languageList.at( pos ); + TQStringList::Iterator it = languageList.tqat( pos ); if ( it != languageList.end() ) { @@ -214,8 +214,8 @@ void KLocaleConfig::slotLanguageUp() TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - TQStringList::Iterator it1 = languageList.at( pos - 1 ); - TQStringList::Iterator it2 = languageList.at( pos ); + TQStringList::Iterator it1 = languageList.tqat( pos - 1 ); + TQStringList::Iterator it2 = languageList.tqat( pos ); if ( it1 != languageList.end() && it2 != languageList.end() ) { @@ -236,8 +236,8 @@ void KLocaleConfig::slotLanguageDown() TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - TQStringList::Iterator it1 = languageList.at( pos ); - TQStringList::Iterator it2 = languageList.at( pos + 1 ); + TQStringList::Iterator it1 = languageList.tqat( pos ); + TQStringList::Iterator it2 = languageList.tqat( pos + 1 ); if ( it1 != languageList.end() && it2 != languageList.end() ) { diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 4650e6a23..7832d90d6 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -150,7 +150,7 @@ TQString KLocaleConfigTime::userToStore(const TQValueList<StringPair> & list, if ( !bFound ) { - TQChar c = userFormat.at( pos ); + TQChar c = userFormat.tqat( pos ); if ( c == '%' ) result += c; @@ -169,7 +169,7 @@ TQString KLocaleConfigTime::storeToUser(const TQValueList<StringPair> & list, bool escaped = false; for ( uint pos = 0; pos < storeFormat.length(); ++pos ) { - TQChar c = storeFormat.at(pos); + TQChar c = storeFormat.tqat(pos); if ( escaped ) { StringPair it = StringPair::find( list, c ); @@ -323,7 +323,7 @@ void KLocaleConfigTime::slotCalendarSystemChanged(int calendarSystem) TQString calendarType; bool ok; - calendarType = calendars.at(calendarSystem, &ok); + calendarType = calendars.tqat(calendarSystem, &ok); if ( !ok ) calendarType = calendars.first(); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 7582aea53..d4470be06 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -537,7 +537,7 @@ void KScreenSaver::findSavers() mSaverListView->setSelected(selectedItem, true); mSaverListView->setCurrentItem(selectedItem); mSaverListView->ensureItemVisible(selectedItem); - mSetupBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty()); + mSetupBt->setEnabled(!mSaverList.tqat(mSelected)->setup().isEmpty()); mTestBt->setEnabled(true); } @@ -587,7 +587,7 @@ void KScreenSaver::slotPreviewExited(KProcess *) if (mSelected >= 0) { mPreviewProc->clearArguments(); - TQString saver = mSaverList.at(mSelected)->saver(); + TQString saver = mSaverList.tqat(mSelected)->saver(); TQTextStream ts(&saver, IO_ReadOnly); TQString word; @@ -665,9 +665,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item) bool bChanged = (indx != mSelected); if (!mSetupProc->isRunning()) - mSetupBt->setEnabled(!mSaverList.at(indx)->setup().isEmpty()); + mSetupBt->setEnabled(!mSaverList.tqat(indx)->setup().isEmpty()); mTestBt->setEnabled(true); - mSaver = mSaverList.at(indx)->file(); + mSaver = mSaverList.tqat(indx)->file(); mSelected = indx; setMonitor(); @@ -690,7 +690,7 @@ void KScreenSaver::slotSetup() mSetupProc->clearArguments(); - TQString saver = mSaverList.at(mSelected)->setup(); + TQString saver = mSaverList.tqat(mSelected)->setup(); if( saver.isEmpty()) return; TQTextStream ts(&saver, IO_ReadOnly); @@ -708,7 +708,7 @@ void KScreenSaver::slotSetup() if (!kxsconfig) { word = "-caption"; (*mSetupProc) << word; - word = mSaverList.at(mSelected)->name(); + word = mSaverList.tqat(mSelected)->name(); (*mSetupProc) << word; word = "-icon"; (*mSetupProc) << word; @@ -724,7 +724,7 @@ void KScreenSaver::slotSetup() // Pass translated name to kxsconfig if (kxsconfig) { - word = mSaverList.at(mSelected)->name(); + word = mSaverList.tqat(mSelected)->name(); (*mSetupProc) << word; } @@ -758,7 +758,7 @@ void KScreenSaver::slotTest() } mTestProc->clearArguments(); - TQString saver = mSaverList.at(mSelected)->saver(); + TQString saver = mSaverList.tqat(mSelected)->saver(); TQTextStream ts(&saver, IO_ReadOnly); TQString word; diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 63a049742..74fcf3609 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -226,9 +226,9 @@ TQString USBDevice::dump() r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power); else r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>"); - r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.at(0)); + r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>").arg(*_devnodes.tqat(0)); if ( _devnodes.count() > 1 ) - for ( TQStringList::Iterator it = _devnodes.at(1); it != _devnodes.end(); ++it ) + for ( TQStringList::Iterator it = _devnodes.tqat(1); it != _devnodes.end(); ++it ) r += "<tr><td></td><td>" + *it + "</td></tr>"; #else r += i18n("<tr><td><i>Max. Packet Size</i></td><td>%1</td></tr>").arg(_maxPacketSize); diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index b178e07e3..795b58492 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -20,7 +20,6 @@ #include <tqlayout.h> #include <tqpushbutton.h> -#include <tqlistview.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h index 24a68de8a..6d7a3b2c9 100644 --- a/kcontrol/view1394/view1394.h +++ b/kcontrol/view1394/view1394.h @@ -28,6 +28,7 @@ #include <tqstring.h> #include <tqtimer.h> #include <tqvaluelist.h> +#include <tqlistview.h> #include "view1394widget.h" diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui index a249fb195..eb18e710a 100644 --- a/kcontrol/view1394/view1394widget.ui +++ b/kcontrol/view1394/view1394widget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>View1394Widget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>View1394Widget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Name</string> @@ -145,7 +145,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -170,7 +170,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_busResetPb</cstring> </property> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 78db79f3e..d8f6b4b3d 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -674,7 +674,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) } if (!wl.isEmpty()) - wl.at(0)->setFocus(); + wl.tqat(0)->setFocus(); i++; @@ -693,104 +693,104 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) if ( type == "int" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toInt(); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" || type == "TQ_UINT32" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toUInt(); } else if( type == "long" || type == "long int" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toLong(); } else if( type == "ulong" || type == "unsigned long" || type == "unsigned long int" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toULong(); } else if( type == "short" || type == "short int" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toShort(); } else if( type == "ushort" || type == "unsigned short" || type == "unsigned short int" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toUShort(); } else if ( type == "TQ_UINT64" ) { - KLineEdit* e = ( KLineEdit* )wl.at( i ); + KLineEdit* e = ( KLineEdit* )wl.tqat( i ); arg << e->text().toULongLong(); } else if( type == "float" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toFloat(); } else if( type == "double" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text().toDouble(); } else if( type == "bool" ) { - TQCheckBox* c = (TQCheckBox*)wl.at( i ); + TQCheckBox* c = (TQCheckBox*)wl.tqat( i ); arg << c->isChecked(); } else if( type == "TQCString" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << TQCString( e->text().local8Bit() ); } else if( type == "TQString" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << e->text(); } else if( type == "TQStringList" ) { - KEditListBox* e = (KEditListBox*)wl.at( i ); + KEditListBox* e = (KEditListBox*)wl.tqat( i ); arg << e->items(); } else if( type == "TQValueList<TQCString>" ) { - KEditListBox* e = (KEditListBox*)wl.at( i ); + KEditListBox* e = (KEditListBox*)wl.tqat( i ); for (int i = 0; i < e->count(); i++) arg << TQCString( e->text(i).local8Bit() ); } else if( type == "KURL" ) { - KLineEdit* e = (KLineEdit*)wl.at( i ); + KLineEdit* e = (KLineEdit*)wl.tqat( i ); arg << KURL( e->text() ); } else if( type == "TQColor" ) { - KColorButton* e = (KColorButton*)wl.at( i ); + KColorButton* e = (KColorButton*)wl.tqat( i ); arg << e->color(); } else if( type == "TQSize" ) { - KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i ); + KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i ); arg << TQSize(e->field(1) , e->field(2)) ; } else if( type == "TQPoint" ) { - KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i ); + KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i ); arg << TQPoint(e->field(1) , e->field(2)) ; } else if( type == "TQRect" ) { - KMultiIntEdit* e = (KMultiIntEdit*)wl.at( i ); + KMultiIntEdit* e = (KMultiIntEdit*)wl.tqat( i ); arg << TQRect(e->field(1) , e->field(2) , e->field(3) , e->field(4)) ; } else if( type == "TQPixmap" ) { - KURLRequester* e= (KURLRequester*)wl.at( i ); + KURLRequester* e= (KURLRequester*)wl.tqat( i ); arg << TQPixmap(e->url()); } else @@ -1211,7 +1211,7 @@ void KDCOPWindow::slotCopy() // below list view. If there is nothing selected from // the below menu then tell the tree to copy its current // selection as text. - QClipboard *clipboard = TQApplication::clipboard(); + TQClipboard *clipboard = TQApplication::tqclipboard(); if (mainView->lb_replyData->count()!= 0) { diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp index a8f5ac26c..a11592c33 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.at(choice); + KMJobViewer *view = list.tqat(choice); if (view->isVisible()) KWin::activateWindow(view->winId()); else diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index cf31fce0a..994a44c12 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -35,7 +35,7 @@ noinst_HEADERS = desktop.h bgmanager.h krootwm.h \ kcheckrunning_SOURCES = kcheckrunning.cpp kcheckrunning_LDFLAGS = $(all_libraries) -kcheckrunning_LDADD = $(LIB_X11) +kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT) kxdglauncher_SOURCES = kxdglauncher.cpp kxdglauncher_LDFLAGS = $(all_libraries) diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index de58e0d24..a3ddff56f 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -1179,7 +1179,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int void KDesktop::removeIcon(const TQString &_url) { - if (_url.at(0) != '/') { + if (_url.tqat(0) != '/') { qDebug("removeIcon with relative path not supported for now"); return; } diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 076831bba..23c89f8ce 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -159,7 +159,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name ) // Initialize media handler mMediaListView = new TQListView(); - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), + connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); setURL( desktopURL() ); // sets m_url @@ -441,8 +441,8 @@ void KDIconView::createActions() (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" ); KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); + connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); KConfig config("kdeglobals", true, false); config.setGroup( "KDE" ); @@ -1047,7 +1047,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) bool firstRun = (count() == 0); // no icons yet, this seems to be the initial loading // delay updates until all new items have been created - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); TQRect area = iconArea(); setIconArea( TQRect( 0, 0, -1, -1 ) ); @@ -1150,7 +1150,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) if ( m_autoAlign ) lineupIcons(); - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); } // ----------------------------------------------------------------------------- diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp index e8493b92b..b90bf3b52 100644 --- a/kdesktop/kshadowengine.cpp +++ b/kdesktop/kshadowengine.cpp @@ -84,8 +84,8 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC result.create(w, h, 32); } - result.fill(0); // all black result.setAlphaBuffer(true); + result.fill(0); // all black for (int i = thick; i < w - thick; i++) { diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp index daa522ee1..1500f6205 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.at(0) != '/') + if (file.tqat(0) != '/') { KStandardDirs dirs; dirs.addKDEDefaults(); diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 9914306ba..33bcac528 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.at(0) == ':' ); + bool specialDir = ( startDir.tqat(0) == ':' ); KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true ); if ( !specialDir ) dlg.setSelection( startDir ); diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index b80f63279..4748b3f62 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -952,7 +952,7 @@ KGStdVerify::slotPluginSelected( int id ) return; if (id != curPlugin) { plugMenu->setItemChecked( curPlugin, false ); - parent->setUpdatesEnabled( false ); + parent->tqsetUpdatesEnabled( false ); grid->removeItem( greet->getLayoutItem() ); Debug( "delete %s\n", pName.data() ); delete greet; @@ -960,7 +960,7 @@ KGStdVerify::slotPluginSelected( int id ) handler->verifyPluginChanged( id ); if (running) start(); - parent->setUpdatesEnabled( true ); + parent->tqsetUpdatesEnabled( true ); } } diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 3d81de58a..2d3f841f4 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -564,7 +564,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) } else { // int value dType = DTpixel; TQString sCopy = s; - if (sCopy.at( 0 ) == '-') { + if (sCopy.tqat( 0 ) == '-') { sCopy.remove( 0, 1 ); dType = DTnpixel; } @@ -588,7 +588,7 @@ KdmItem::parseFont( const TQString &s, TQFont &font ) void KdmItem::parseColor( const TQString &s, TQColor &color ) { - if (s.at( 0 ) != '#') + if (s.tqat( 0 ) != '#') return; bool ok; TQString sCopy = s; @@ -621,7 +621,7 @@ KdmItem::tqparentWidget() const if (!this->parent()) return 0; - if (tqparent()->tqqt_cast("TQWidget")) + if (tqparent()->qt_cast("TQWidget")) return (TQWidget*)parent(); return ((KdmItem*)parent())->tqparentWidget(); } diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 31d4fcfa2..1c6450b50 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -147,7 +147,7 @@ public: TQString baseDir() const { if (basedir.isEmpty() && parent()) - return static_cast<KdmItem *>( tqparent()->tqqt_cast( "KdmItem" ) )->baseDir(); + return static_cast<KdmItem *>( tqparent()->qt_cast( "KdmItem" ) )->baseDir(); return basedir; } diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index 55a993988..b36b7e5ad 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -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.at(cAccel))); - tarea.rLeft() += fm.width(cText.at(cAccel)); + p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.tqat(cAccel))); + tarea.rLeft() += fm.width(cText.tqat(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 2322312e8..9b90799d5 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -128,7 +128,7 @@ KdmPixmap::fullPath( const TQString &fileName) return TQString::null; TQString fullName = fileName; - if (fullName.at( 0 ) != '/') + if (fullName.tqat( 0 ) != '/') fullName = baseDir() + "/" + fileName; return fullName; } diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index f95343787..5ff9b6711 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -358,7 +358,7 @@ KdmThemer::slotActivated( const TQString &id ) return; item->widget()->setFocus(); - TQLineEdit *le = (TQLineEdit*)item->widget()->tqqt_cast("TQLineEdit"); + TQLineEdit *le = (TQLineEdit*)item->widget()->qt_cast("TQLineEdit"); if (le) le->selectAll(); } diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h index b531adee7..ebfef6f9e 100644 --- a/kdmlib/kgreet_pam.h +++ b/kdmlib/kgreet_pam.h @@ -64,7 +64,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { virtual void revive(); virtual void clear(); - TQGridLayout *getLayoutItem() const { return TQT_TQGRIDLAYOUT(static_cast<QLayoutItem*>(layoutItem)); } + TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))); } public slots: void slotLoginLostFocus(); diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 95a8c3048..990cd9fec 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -498,7 +498,7 @@ void KfindTabWidget::slotEditRegExp() if ( ! regExpDialog ) regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); - KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->tqqt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->qt_cast( "KRegExpEditorInterface" ) ); if ( !iface ) return; diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 963fdaf92..efcdc98cc 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.at(i); + KfFileLVI *item = (KfFileLVI *) selected.tqat(i); KFileItem file = item->fileitem; KIO::NetAccess::del(file.url(), this); @@ -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.at( i ); + KfFileLVI *item = (KfFileLVI *) selected.tqat( i ); if (item) { uris.append( item->fileitem.url() ); diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index 96747696b..03f9a7721 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.at( i + 1 ), entry ); + mChildren.insert( mChildren.tqat( i + 1 ), entry ); break; } } diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index ef9cbe7c0..6f37884f4 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.at( m_entries.count() - 1 ); // go to last one + m_entries.tqat( 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.at( m_entries.count() - 1 ); + m_entries.tqat( 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.at() == (int) m_entries.count() - 1 ); + Q_ASSERT( m_entries.tqat() == (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.at() + steps; + int newPos = m_entries.tqat() + steps; - current = m_entries.at( newPos ); + current = m_entries.tqat( 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.at() + 4; + m_goMenuHistoryStartPos = m_entries.tqat() + 4; // Forward not big enough ? - if ( m_entries.at() > (int)m_entries.count() - 4 ) + if ( m_entries.tqat() > (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.at(); // for slotActivated + m_goMenuHistoryCurrentPos = m_entries.tqat(); // 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.at(); // Jump to current item + it += m_entries.tqat(); // 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.at() > 0; + return m_entries.tqat() > 0; } bool History::canGoForward() const { - return m_entries.at() != static_cast<int>( m_entries.count() ) - 1; + return m_entries.tqat() != static_cast<int>( m_entries.count() ) - 1; } #include "history.moc" diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index c9feaa61f..7a3483caf 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.at( dir.length() - 1 ) == '/' ); + assert( dir.tqat( 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 ).at( ( *it ).length() - 1 ) != '/' ) + if ( ( *it ).tqat( ( *it ).length() - 1 ) != '/' ) ( *it ) += '/'; dirs.append(*it); } diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index 3cb642b5f..9745d6066 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -211,7 +211,7 @@ bool KTagComboBox::containsTag( const TQString &str ) const TQString KTagComboBox::currentTag() const { - return *tags->at(currentItem()); + return *tags->tqat(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->at(i); + return *tags->tqat(i); } int KTagComboBox::currentItem() const diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 02e59936a..c4eb13f3a 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.at( 0 ); + f.tqat( 0 ); TQTextStream stream( &f ); stream.setEncoding( TQTextStream::UnicodeUTF8 ); stream << doc.toString(); diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index a28b5097f..8d198f9be 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -62,7 +62,7 @@ View::~View() void View::copySelectedText() { - kapp->clipboard()->setText( selectedText() ); + kapp->tqclipboard()->setText( selectedText() ); } bool View::openURL( const KURL &url ) @@ -276,7 +276,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos) void View::slotCopyLink() { - TQApplication::clipboard()->setText(mCopyURL); + TQApplication::tqclipboard()->setText(mCopyURL); } bool View::prevPage(bool checkOnly) diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index cb2ef54d1..5b99a1cba 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.at(f*BytePS+k)&0x000000FF) << (k*8); + nb |= (SoundData.tqat(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.at(f) * ((double)(1<<13)/(signed)max) ) ); + 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; -// kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; +// kdDebug( 1217 ) << k_funcinfo << data.tqat(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 6453563de..9dca03a99 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.at(pos))/max; + return (float)(data.tqat(pos))/max; } inline uint fs() const diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index 773f28731..b40c8fd6a 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.at(x)); + Complex s(sound.tqat(x)); double angle=-2*PI*f*x/8000; s*= Complex( cos(angle) , sin(angle) ); c+=s; @@ -228,7 +228,7 @@ bool VoiceSignature::window(const Sound& sound, unsigned int *_start, unsigned i if(length < unit ) return false; - //Fen�trage + //Fen�trage unsigned int start=0 , stop=0; double moy=0; for(uint x=0;x<unit;x++) diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 072bd6161..48cd1d2ae 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -364,9 +364,9 @@ void DigitalClock::updateClock() if (_force || newStr != _timeStr) { _timeStr = newStr; - setUpdatesEnabled( FALSE ); + tqsetUpdatesEnabled( FALSE ); display(_timeStr); - setUpdatesEnabled( TRUE ); + tqsetUpdatesEnabled( TRUE ); update(); } @@ -426,7 +426,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - setUpdatesEnabled( FALSE ); + tqsetUpdatesEnabled( FALSE ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -441,7 +441,7 @@ void DigitalClock::drawContents( TQPainter * p) pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - setUpdatesEnabled( TRUE ); + tqsetUpdatesEnabled( TRUE ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } @@ -1031,7 +1031,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.at(1) == 'y' || dateFormat.at(1) == 'Y'; + dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y'; } if (dateFirst) @@ -1616,7 +1616,7 @@ void ClockApplet::slotCopyMenuActivated( int id ) { TQPopupMenu *m = (TQPopupMenu *) sender(); TQString s = m->text(id); - TQApplication::clipboard()->setText(s); + TQApplication::tqclipboard()->setText(s); } TQTime ClockApplet::clockGetTime() diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 85f28845c..d96e72140 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -24,15 +24,15 @@ public: void setDragging(bool drag); void setEnableDrag(bool enable); void deleteContents(); - void setUpdatesEnabled(bool enable); + void tqsetUpdatesEnabled(bool enable); }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) { return findProperty(desc, std::mem_fun(&QuickButton::url));} -inline void QuickButtonGroup::setUpdatesEnabled(bool enable) +inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { - (*i)->setUpdatesEnabled(enable); + (*i)->tqsetUpdatesEnabled(enable); if (enable) { (*i)->update();} } } diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 9c1228a2d..85bea706e 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -741,8 +741,8 @@ void QuickLauncher::refreshContents() unsigned index; TQPoint pos; - setUpdatesEnabled(false); - m_buttons->setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); + m_buttons->tqsetUpdatesEnabled(false); for (index = 0; index < m_buttons->size(); index++) { pos = m_manager->pos(index); @@ -762,9 +762,9 @@ void QuickLauncher::refreshContents() m_dragButtons->setDragging(true); } m_buttons->show(); - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); update(); - m_buttons->setUpdatesEnabled(true); + m_buttons->tqsetUpdatesEnabled(true); updateGeometry(); emit updateLayout(); updateStickyHighlightLayer(); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 25b5869ff..d07bfdd2b 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -175,9 +175,9 @@ void MediaApplet::arrangeButtons() // Center icons if we only have one column/row if (mButtonList.count() < max_packed_buttons) { - max_packed_buttons = QMAX(uint(1), mButtonList.count()); + max_packed_buttons = TQMAX(uint(1), mButtonList.count()); } - max_packed_buttons = QMAX(uint(1), max_packed_buttons); + max_packed_buttons = TQMAX(uint(1), max_packed_buttons); int padded_button_size = kicker_size / max_packed_buttons; mButtonSizeSum = 0; diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index beb70552d..23bdf62c9 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet signals: - void layoutChanged(); + void tqlayoutChanged(); protected slots: diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index e8ab4b567..299206032 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -867,7 +867,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) void SystemTrayApplet::layoutTray() { - setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); int iconCount = m_shownWins.count(); @@ -1017,7 +1017,7 @@ void SystemTrayApplet::layoutTray() } } - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); updateGeometry(); setBackground(); } diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 95dcccbc9..c39ac5d4b 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -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.at(pos)->popupMenu(e->globalPos()); + if (pos != -1) containers.tqat(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.at(pos); + original_container = containers.tqat(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 72dca2567..1fb2d6ad3 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -414,7 +414,7 @@ void KasBar::updateLayout() if ( !isUpdatesEnabled() ) return; bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); // This is for testing a rectangular layout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); @@ -443,7 +443,7 @@ void KasBar::updateLayout() resize( sz ); } - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); TQWidget *top = tqtopLevelWidget(); TQRegion mask; @@ -451,24 +451,24 @@ void KasBar::updateLayout() KasItem *i; if ( orient == Qt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { - int x = (items.at() % c) * itemExtent(); + int x = (items.tqat() % c) * itemExtent(); if ( direction_ == TQBoxLayout::RightToLeft ) x = width() - x - itemExtent(); - i->setPos( x, (items.at() / c) * itemExtent() ); + i->setPos( x, (items.tqat() / 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.at() / r) * itemExtent(); + int y = (items.tqat() / r) * itemExtent(); if ( direction_ == TQBoxLayout::BottomToTop ) y = height() - y - itemExtent(); - i->setPos( (items.at() % r) * itemExtent(), y ); + i->setPos( (items.tqat() % r) * itemExtent(), y ); i->update(); mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } @@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev) TQPainter p( &offscreen ); paintBackground( &p, TQRect(TQPoint(0,0),size()) ); TQWidget::resizeEvent(ev); - emit layoutChanged(); + emit tqlayoutChanged(); } diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index e1fabddae..c75bdc31e 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.at( i ); } + KasItem *itemAt( uint i ) { return items.tqat( i ); } int indexOf( KasItem *i ) { return items.tqfind( i ); } KasItemList *itemList() { return &items; } @@ -251,7 +251,7 @@ signals: void directionChanged(); /** Emitted when kasbar wants to resize. This happens when a new window is added. */ - void layoutChanged(); + void tqlayoutChanged(); /** Emitted when the item size is changed. */ void itemSizeChanged( int ); diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index c63d6e277..dcb1a1ef1 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); + connect( kasbar, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 12058a3c7..5f282db97 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); + connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) ); + connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) ); connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } @@ -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.at( i ); + Task::Ptr t = items.tqat( 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 e30260f57..ec6f07493 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.at( i ); } + Task::Ptr task( uint i ) { return items.tqat( i ); } int taskCount() const { return items.count(); } TQPixmap icon(); diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 851b7d915..28be059ae 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -315,7 +315,7 @@ void KasTasker::moveToMain( KasGroupItem *gi, Task::Ptr t ) void KasTasker::moveToMain( KasGroupItem *gi ) { bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); int i = indexOf( gi ); @@ -327,7 +327,7 @@ void KasTasker::moveToMain( KasGroupItem *gi ) gi->hidePopup(); remove( gi ); - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); updateLayout(); } @@ -346,7 +346,7 @@ void KasTasker::removeStartup( Startup::Ptr s ) void KasTasker::refreshAll() { bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); clear(); @@ -365,7 +365,7 @@ void KasTasker::refreshAll() addTask( t.data() ); } - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); updateLayout(); } @@ -572,7 +572,7 @@ void KasTasker::readConfig( KConfig *conf ) } bool updates = isUpdatesEnabled(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); // @@ -653,7 +653,7 @@ void KasTasker::readConfig( KConfig *conf ) // fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true ); // enablePopup = conf->readBoolEntry( "EnablePopup", true ); - setUpdatesEnabled( updates ); + tqsetUpdatesEnabled( updates ); emit configChanged(); } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 64dda4185..bbc4f6654 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -173,14 +173,14 @@ void KasTaskItem::updateTask(bool geometryChangeOnly) } bool updates = kasbar()->isUpdatesEnabled(); - kasbar()->setUpdatesEnabled( false ); + kasbar()->tqsetUpdatesEnabled( false ); setProgress( kasbar()->showProgress() ? 0 : -1 ); setText( task_->visibleIconicName() ); setModified( task_->isModified() ); setActive( task_->isActive() ); - kasbar()->setUpdatesEnabled( updates ); + kasbar()->tqsetUpdatesEnabled( updates ); update(); } diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 301011688..4853b8d88 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->at(m_idx))->item : 0; + return m_idx < int(m_list->count()) ? (*m_list->tqat(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->at(m_idx); + ContainerAreaLayout::ItemList::iterator b = m_list->tqat(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.at(index))->item : 0; + return index >= 0 && index < m_items.count() ? (*m_items.tqat(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.at(index); - m_items.remove(m_items.at(index)); + ContainerAreaLayoutItem *b = *m_items.tqat(index); + m_items.remove(m_items.tqat(index)); TQLayoutItem *item = b->item; b->item = 0; delete b; diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index d2952d93a..06fc689f6 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -344,7 +344,7 @@ void PanelKMenu::initialize() if (clients.count() > 0) { TQIntDictIterator<KickerClientMenu> it(clients); while (it){ - if (it.current()->text.at(0) != '.') + if (it.current()->text.tqat(0) != '.') insertItem( it.current()->icon, it.current()->text, diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 3fa259189..66dd71503 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().at(0) == '.')) + if ((g->name().tqat(0) == '.')) { continue; } diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 3c14a74aa..295651523 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.at(id) != m_containers.end()) + if (m_containers.tqat(id) != m_containers.end()) { - m_containerArea->removeContainer(*m_containers.at(id)); + m_containerArea->removeContainer(*m_containers.tqat(id)); } } diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 8f02abd67..678d6a78f 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.at(id) != containers.end()) + if (containers.tqat(id) != containers.end()) { - containerArea->removeContainer(*containers.at(id)); + containerArea->removeContainer(*containers.tqat(id)); } } diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index e1d8d62c4..c28ae1162 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.at(id) != m_containers.end()) + else if (m_containers.tqat(id) != m_containers.end()) { - ExtensionManager::the()->removeContainer(*m_containers.at(id)); + ExtensionManager::the()->removeContainer(*m_containers.tqat(id)); } } diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 76aa6162e..9c4d09929 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().at(0) == '.')) + if ((g->name().tqat(0) == '.')) { continue; } @@ -445,7 +445,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, return; // ignore dotfiles. - if ((serviceName.at(0) == '.')) + if ((serviceName.tqat(0) == '.')) return; // item names may contain ampersands. To avoid them being converted diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 9d1305da3..ee36c9737 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -470,9 +470,8 @@ void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int al if (pix.isNull() || last_color != color || last_alpha != alpha) { TQImage img(16, 16, 32); - img.setAlphaBuffer(false); - img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); img.setAlphaBuffer(true); + img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); pix.convertFromImage(img); last_color = color; last_alpha = alpha; diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 936d8a536..3b68c0529 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.at(0) == '.')) + if ((serviceName.tqat(0) == '.')) { return; } @@ -290,7 +290,7 @@ void PrefMenu::initialize() } // Ignore dotfiles. - if ((g->name().at(0) == '.')) + if ((g->name().tqat(0) == '.')) { continue; } diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index b2159c196..c1204598a 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.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(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.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(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.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it == list.end()) { diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 345fcb1f9..749c33c03 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.at(currentFrame) != frames.end()) + if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end()) { - TQPixmap *pm = *frames.at(currentFrame); + TQPixmap *pm = *frames.tqat(currentFrame); // draw pixmap if ( pm && !pm->isNull() ) { @@ -586,9 +586,9 @@ void TaskContainer::drawButton(TQPainter *p) // draw button background if (drawButton) { - tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, p, - TQRect(0, 0, width(), height()), - colors); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, + TQRect(1, 1, width()-2, height()-2), + colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised); } // shift button label on sunken buttons @@ -684,11 +684,11 @@ void TaskContainer::drawButton(TQPainter *p) } else { - textPen = p->pen(); + textPen = TQPen(colors.buttonText()); // textPen = p->pen(); } } - int availableWidth = width() - (br.x() * 2) - textPos; + int availableWidth = width() - (br.x() * 2) - textPos - 2; if (m_filteredTasks.count() > 1) { availableWidth -= 8; @@ -721,7 +721,12 @@ void TaskContainer::drawButton(TQPainter *p) TQImage img = pm->convertToImage(); TQImage timg = tpm.convertToImage(); KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red); + + // End painting before assigning the pixmap + QPaintDevice* opd = p->device(); + p->end(); pm->convertFromImage(img); + p->tqbegin(opd ,this); } else { @@ -739,9 +744,9 @@ void TaskContainer::drawButton(TQPainter *p) } } - if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end()) + if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end()) { - TQPixmap *anim = *frames.at(currentFrame); + TQPixmap *anim = *frames.tqat(currentFrame); if (anim && !anim->isNull()) { @@ -841,7 +846,7 @@ TQString TaskContainer::name() } // strip trailing crap - while (i > 0 && !match.at(i).isLetterOrNumber()) + while (i > 0 && !match.tqat(i).isLetterOrNumber()) { --i; } diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index eed255b64..fd344f0d2 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.at(indexOf(m_lastDragId), &ok); + Task::Ptr t = m_tasks.tqat(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.at(index, &ok); + Task::Ptr task = m_tasks.tqat(index, &ok); if (ok) { Task::List tasks; diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index 872950a9b..92299b7a6 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().at(i)).utf8() ); + attrs[i] = strdup( (*usrc.attributes().tqat(i)).utf8() ); attrs[count] = 0; } diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index eec7b965d..20c0d45b8 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.at(0) == '/') { + if (url.tqat(0) == '/') { if (KStandardDirs::exists(url)) { title = url; return true; @@ -93,7 +93,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString §ion) } } - while (url.at(0) == '/') + while (url.tqat(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.at(0) == '/') { + if (title.tqat(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.at(section.length() - 1).isLetter()) { + while (section.tqat(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.at() >= 2048) + if (!insert || m_outputBuffer.tqat() >= 2048) { m_outputBuffer.close(); data(m_outputBuffer.buffer()); diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index e9e0c1f19..b83fba0a0 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.at(index); + return *items.tqat(index); } TABLEROW *copyLayout() const; diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index ed0664919..84744eb33 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.at(0) == '/') + if (path.tqat(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.at(0) == '/') + if (_path.tqat(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.at(0) == '/') { + if (_path.tqat(0) == '/') { _path.remove(0, 1); } diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc index 28aaba846..a525b028f 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.at(i) << ")" << endl; + kdDebug() << "Item (" << *rest.tqat(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().at(0) == '.')) + if ((g->name().tqat(0) == '.')) continue; TQString relPath = g->relPath(); diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index d82301e94..12b8a1366 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.tqfind('/', 1); if (index > 1) share = share.left(index); - if (share.at(0) == '/') + if (share.tqat(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 cab3fe9be..81f08a94a 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.at(5) != '/') { + if (surl.tqat(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.at( 0 ) = dirpName.at( 0 ).upper(); + atom.m_str.tqat( 0 ) = dirpName.tqat( 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 04d4f56fd..97fcd3d0d 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.at(0)).mid(2); - share=(*sl.at(1)); + host=(*sl.tqat(0)).mid(2); + share=(*sl.tqat(1)); kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; } diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp index db39e9652..d2960fa7e 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.at( i ); + TQChar ch = text.tqat( i ); if ( ch == '\n' ) { newLine = true; continue; } - else if ( ch == '\r' && text.at(i+1) == '\n' ) + else if ( ch == '\r' && text.tqat(i+1) == '\n' ) { newLine = true; i++; // skip the next character (\n) as well diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index d87e59985..d0b5cf01d 100644 --- a/klipper/clipboardpoll.cpp +++ b/klipper/clipboardpoll.cpp @@ -46,7 +46,7 @@ In order to avoid transferring all the data on every time pulse, this file implements two optimizations: The first one is checking whether the selection owner is Qt application (using the _QT_SELECTION/CLIPBOARD_SENTINEL atoms on the root window of screen 0), and if yes, - Klipper can rely on QClipboard's signals. If the owner is not Qt app, and the ownership has changed, + Klipper can rely on TQClipboard's signals. If the owner is not Qt app, and the ownership has changed, it means the selection has changed as well. Otherwise, first only the timestamp of the last selection change is requested using the TIMESTAMP selection target, and if it's the same, it's assumed the contents haven't changed. Note that some applications (like XEmacs) does @@ -111,8 +111,8 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent ) void ClipboardPoll::initPolling() { - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); - connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); + connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); + connect( kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout())); timer.start( 1000, false ); selection.atom = XA_PRIMARY; @@ -149,7 +149,7 @@ bool ClipboardPoll::x11Event( XEvent* e ) if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify ) { XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e ); - if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection()) + if( ev->selection == XA_PRIMARY && !kapp->tqclipboard()->ownsSelection()) { #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED (XFIXES)" << endl; @@ -157,7 +157,7 @@ bool ClipboardPoll::x11Event( XEvent* e ) qt_x_time = ev->timestamp; emit clipboardChanged( true ); } - else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard()) + else if( ev->selection == xa_clipboard && !kapp->tqclipboard()->ownsClipboard()) { #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl; @@ -220,13 +220,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data ) void ClipboardPoll::timeout() { KlipperWidget::updateTimestamp(); - if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) { + if( !kapp->tqclipboard()->ownsSelection() && checkTimestamp( selection ) ) { #ifdef NOISY_KLIPPER_ kdDebug() << "SELECTION CHANGED" << endl; #endif emit clipboardChanged( true ); } - if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { + if( !kapp->tqclipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) { #ifdef NOISY_KLIPPER_ kdDebug() << "CLIPBOARD CHANGED" << endl; #endif diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 73df8dd26..72473d300 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -204,7 +204,7 @@ void ListView::rename( TQListViewItem* item, int c ) if ( gui ) { if ( ! _regExpEditor ) _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); - KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( _regExpEditor->tqqt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( _regExpEditor->qt_cast( "KRegExpEditorInterface" ) ); assert( iface ); iface->setRegExp( item->text( 0 ) ); diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp index b217bdb31..3dfc37f17 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.tqencodedData( "application/x-kde-cutselection" ); - bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1 + bool cut = !a.isEmpty() && (a.tqat(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } } diff --git a/klipper/historyitem.h b/klipper/historyitem.h index 437bc84f0..b0ab0bc53 100644 --- a/klipper/historyitem.h +++ b/klipper/historyitem.h @@ -49,7 +49,7 @@ public: inline virtual const TQPixmap& image() const; /** - * Returns TQMimeSource suitable for QClipboard::setData(). + * Returns TQMimeSource suitable for TQClipboard::setData(). */ virtual TQMimeSource* mimeSource() const = 0; diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index b91b5deb0..ce539f825 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -698,8 +698,8 @@ void KlipperWidget::slotClearClipboard() { Ignore lock( locklevel ); - clip->clear(QClipboard::Selection); - clip->clear(QClipboard::Clipboard); + clip->clear(TQClipboard::Selection); + clip->clear(TQClipboard::Clipboard); } @@ -712,11 +712,11 @@ TQString KlipperWidget::clipboardContents( bool * /*isSelection*/ ) #if 0 bool selection = true; - TQMimeSource* data = clip->data(QClipboard::Selection); + TQMimeSource* data = clip->data(TQClipboard::Selection); if ( data->serialNumber() == m_lastSelection ) { - TQString clipContents = clip->text(QClipboard::Clipboard); + TQString clipContents = clip->text(TQClipboard::Clipboard); if ( clipContents != m_lastClipboard ) { contents = clipContents; @@ -845,7 +845,7 @@ void KlipperWidget::checkClipData( bool selectionMode ) kdDebug() << "\nselectionMode=" << selectionMode << "\nserialNo=" << clip->data()->serialNumber() << " (sel,cli)=(" << m_lastSelection << "," << m_lastClipboard << ")" << "\nowning (sel,cli)=(" << clip->ownsSelection() << "," << clip->ownsClipboard() << ")" - << "\ntext=" << clip->text( selectionMode ? QClipboard::Selection : QClipboard::Clipboard) << endl; + << "\ntext=" << clip->text( selectionMode ? TQClipboard::Selection : TQClipboard::Clipboard) << endl; #endif #if 0 @@ -963,14 +963,14 @@ void KlipperWidget::setClipboard( const HistoryItem& item, int mode ) #ifdef NOSIY_KLIPPER kdDebug() << "Setting selection to <" << item.text() << ">" << endl; #endif - clip->setData( item.mimeSource(), QClipboard::Selection ); + clip->setData( item.mimeSource(), TQClipboard::Selection ); m_lastSelection = clip->data()->serialNumber(); } if ( mode & Clipboard ) { #ifdef NOSIY_KLIPPER kdDebug() << "Setting clipboard to <" << item.text() << ">" << endl; #endif - clip->setData( item.mimeSource(), QClipboard::Clipboard ); + clip->setData( item.mimeSource(), TQClipboard::Clipboard ); m_lastClipboard = clip->data()->serialNumber(); } @@ -1028,10 +1028,10 @@ bool KlipperWidget::ignoreClipboardChanges() const return false; } -// QClipboard uses qt_x_time as the timestamp for selection operations. +// TQClipboard uses qt_x_time as the timestamp for selection operations. // It is updated mainly from user actions, but Klipper polls the clipboard // without any user action triggering it, so qt_x_time may be old, -// which could possibly lead to QClipboard reporting empty clipboard. +// which could possibly lead to TQClipboard reporting empty clipboard. // Therefore, qt_x_time needs to be updated to current X server timestamp. // Call KApplication::updateUserTime() only from functions that are diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 0f518f065..87cc8c695 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -121,7 +121,7 @@ void KMenuEdit::slotChangeView() #endif // disabling the updates prevents unnecessary redraws - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); guiFactory()->removeClient( this ); delete m_actionDelete; diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 6291b72d5..05b0d19e9 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *tqparentWidget, TQObject *parent, const char *name, const char *, const TQStringList & ) { - //KonqFrame *frame = dynamic_cast<KonqFrame *>( tqparentWidget ); + //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( tqparentWidget ); //if ( !frame ) return 0; return new KonqAboutPage( //frame->childView()->mainWindow(), @@ -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.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - res = res.arg( "" ); + res = res.tqarg( "" ); // 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").arg(name)); + KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").tqarg(name)); if ( service ) { TQString searchBar = parts[1]; searchBar = searchBar - .arg( iconSize ).arg( iconSize ) - .arg( service->name() ) - .arg( service->property("Keys").toStringList()[0] ) + .tqarg( iconSize ).tqarg( iconSize ) + .tqarg( service->name() ) + .tqarg( service->property("Keys").toStringList()[0] ) ; res = parts[0] + searchBar + parts[2]; } else res = parts[0] + parts[2]; } - 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" ) ) + 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" ) ) ; 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.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - 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 " + 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 " "both local and networked folders while enjoying advanced features " "such as the powerful sidebar and file previews." ) ) - .arg( i18n( "Konqueror is also a full featured and easy to use web browser which you " + .tqarg( 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.") ) - .arg( i18n( "To return to the previous " + .tqarg( i18n( "To return to the previous " "location, press the back button <img width='16' height='16' src=\"%1\"> " - "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," + "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," " 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\".").arg("config:/disable_overview") ) - .arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path ) - .arg( i18n( "Next: Tips & Tricks" ) ) + "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" ) ) ; @@ -250,69 +250,69 @@ TQString KonqAboutPageFactory::specs() if ( res.isEmpty() ) return res; - res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - 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. " + 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. " "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:").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") ) + "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") ) ; @@ -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.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); else - 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, " + 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, " "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." ).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 " + "<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 " "clear the current entry by pressing the black arrow with the white cross " "<img width='16' height='16' src=\"%1\"> in the toolbar.") - .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, " + .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, " "simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to " "the desktop, and choose \"Link\"." ) ) - .arg( i18n( "You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode\" " + .tqarg( 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.").arg(window_fullscreen_icon_path) ) - .arg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window " + "sessions.").tqarg(window_fullscreen_icon_path) ) + .tqarg( 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." ).arg(view_left_right_icon_path)) - .arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting " + ", 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 " "asks you to use a different browser " - "(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 " + "(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 " "Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show " - "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" ) ) + "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" ) ) ; @@ -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" )) - .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>")); + .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>")); 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").arg(what) ) ); + begin( KURL( TQString("about:%1").tqarg(what) ) ); write( html ); end(); m_htmlDoc = html; diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index f9129ce71..87eba006d 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -273,7 +273,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co //enable menu item representing the saved sorting criterion TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); - KRadioAction *sort_action = dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.latin1())); + KRadioAction *sort_action = tqt_dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.latin1())); if(sort_action!=NULL) sort_action->activate(); m_paSortDirsFirst = new KToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" ); @@ -872,7 +872,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url ) // the completed() signal, so handle that case. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { - m_pIconView->viewport()->setUpdatesEnabled( true ); + m_pIconView->viewport()->tqsetUpdatesEnabled( true ); m_pIconView->viewport()->tqrepaint(); } if ( m_pEnsureVisible ){ @@ -892,7 +892,7 @@ void KonqKfmIconView::slotCompleted() // not been called), a viewport tqrepaint is forced. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { - m_pIconView->viewport()->setUpdatesEnabled( true ); + m_pIconView->viewport()->tqsetUpdatesEnabled( true ); m_pIconView->viewport()->tqrepaint(); } @@ -952,7 +952,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) // We need to disable graphics updates on the iconview when // inserting items, or else a blank paint operation will be // performed on the top-left corner for each inserted item! - m_pIconView->setUpdatesEnabled( false ); + m_pIconView->tqsetUpdatesEnabled( false ); for (KFileItemListIterator it(entries); it.current(); ++it) { //kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl; @@ -1006,11 +1006,11 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) m_itemDict.insert( *it, item ); } // After filtering out updates-on-insertions we can re-enable updates - m_pIconView->setUpdatesEnabled( true ); + m_pIconView->tqsetUpdatesEnabled( true ); // Locking the viewport has filtered out blanking and now, since we // have some items to draw, we can restore updating. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) - m_pIconView->viewport()->setUpdatesEnabled( true ); + m_pIconView->viewport()->tqsetUpdatesEnabled( true ); KonqDirPart::newItems( entries ); } @@ -1150,7 +1150,7 @@ void KonqKfmIconView::slotClear() // meaningless paint operations (such as a clear() just before drawing // fresh contents) we disable updating the viewport until we'll // receive some data or a timeout timer expires. - m_pIconView->viewport()->setUpdatesEnabled( false ); + m_pIconView->viewport()->tqsetUpdatesEnabled( false ); if ( !m_pTimeoutRefreshTimer ) { m_pTimeoutRefreshTimer = new TQTimer( this ); @@ -1247,9 +1247,9 @@ void KonqKfmIconView::slotRefreshViewport() kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl; TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); - vp->setUpdatesEnabled( true ); + vp->tqsetUpdatesEnabled( true ); vp->tqrepaint(); - vp->setUpdatesEnabled( prevState ); + vp->tqsetUpdatesEnabled( prevState ); } bool KonqKfmIconView::doOpenURL( const KURL & url ) diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index bbfb548ad..1f03665d4 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() { TQValueList<KBookmark> bookmarks = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap()); KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */); - kapp->tqclipboard()->setData(data, QClipboard::Clipboard); + kapp->tqclipboard()->setData(data, TQClipboard::Clipboard); } void ActionsImpl::slotPaste() { @@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() { KEBMacroCommand *mcmd = CmdGen::insertMimeSource( i18n("Paste"), - kapp->tqclipboard()->data(QClipboard::Clipboard), + kapp->tqclipboard()->data(TQClipboard::Clipboard), ListView::self()->userAddress()); CmdHistory::self()->didCommand(mcmd); } diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index ce2d9db58..0cc8f823f 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -247,7 +247,7 @@ KEBApp::KEBApp( m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), + connect(kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() { // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl; if (!m_readOnly) { m_canPaste = KBookmarkDrag::canDecode( - kapp->tqclipboard()->data(QClipboard::Clipboard)); + kapp->tqclipboard()->data(TQClipboard::Clipboard)); updateActions(); } } diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index 35c5fec83..047066040 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.at() << endl; + //kdDebug(1202) << "fillHistoryPopup position: " << history.tqat() << endl; HistoryEntry * current = history.current(); TQPtrListIterator<HistoryEntry> it( history ); if (onlyBack || onlyForward) { - it += history.at(); // Jump to current item + it += history.tqat(); // 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.at() << endl; + //kdDebug(1202) << "After fillHistoryPopup position: " << history.tqat() << endl; } /////////////////////////////// @@ -116,7 +116,7 @@ void KonqBidiHistoryAction::fillGoMenu( const TQPtrList<HistoryEntry> & history if (history.isEmpty()) return; // nothing to do - //kdDebug(1202) << "fillGoMenu position: " << history.at() << endl; + //kdDebug(1202) << "fillGoMenu position: " << history.tqat() << 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.at() + 4; + m_startPos = history.tqat() + 4; // Forward not big enough ? - if ( history.at() > (int)history.count() - 4 ) + if ( history.tqat() > (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.at(); // for slotActivated + m_currentPos = history.tqat(); // 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->at( id ); + KonqHistoryEntry *entry = s_mostEntries->tqat( 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->at( --id ) : 0L; + entry = (id > 0) ? s_mostEntries->tqat( --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 849d45668..41dbdad71 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.at() + int m_currentPos; // == history.tqat() TQPopupMenu *m_goMenu; // hack }; diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 9bd39a86e..0f13236e5 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -272,14 +272,14 @@ void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, c listBox()->changeItem( item, index ); /* - setUpdatesEnabled( false ); - lineEdit()->setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); + lineEdit()->tqsetUpdatesEnabled( false ); removeItem( index ); insertItem( pix, t, index ); - setUpdatesEnabled( true ); - lineEdit()->setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); + lineEdit()->tqsetUpdatesEnabled( true ); update(); */ } @@ -301,12 +301,12 @@ void KonqCombo::updatePixmaps() { saveState(); - setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); KonqPixmapProvider *prov = KonqPixmapProvider::self(); for ( int i = 1; i < count(); i++ ) { updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); } - setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); tqrepaint(); restoreState(); @@ -521,15 +521,15 @@ void KonqCombo::slotRemoved( const TQString& item ) void KonqCombo::removeURL( const TQString& url ) { - setUpdatesEnabled( false ); - lineEdit()->setUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); + lineEdit()->tqsetUpdatesEnabled( false ); removeFromHistory( url ); applyPermanent(); setTemporary( currentText() ); - setUpdatesEnabled( true ); - lineEdit()->setUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); + lineEdit()->tqsetUpdatesEnabled( true ); update(); } diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 965fcec06..d8c80b234 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -460,8 +460,11 @@ void KonqFrame::slotLinkedViewClicked( bool mode ) void KonqFrame::paintEvent( TQPaintEvent* ) { -// m_pStatusBar->tqrepaint(); - m_pStatusBar->update(); +#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(); +#endif // USE_QT4 } void KonqFrame::slotRemoveView() diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index ed06539e5..f162c0b60 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -3495,7 +3495,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); @@ -3536,7 +3536,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); @@ -3584,7 +3584,7 @@ void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::Butto m_combo->clearTemporary(); focusLocationBar(); if ( state & Qt::MidButton ) - m_combo->setURL( TQApplication::clipboard()->text( QClipboard::Selection ) ); + m_combo->setURL( TQApplication::tqclipboard()->text( TQClipboard::Selection ) ); } void KonqMainWindow::slotForceSaveMainWindowSettings() diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc index fbac4e65c..a23513bd0 100644 --- a/konqueror/konq_run.cc +++ b/konqueror/konq_run.cc @@ -148,7 +148,7 @@ void KonqRun::init() KParts::BrowserRun::init(); // Maybe init went to the "let's try stat'ing" part. Then connect to info messages. // (in case it goes to scanFile, this will be done below) - KIO::StatJob *job = dynamic_cast<KIO::StatJob*>( m_job ); + KIO::StatJob *job = tqt_dynamic_cast<KIO::StatJob*>( m_job ); if ( job && !job->error() && m_pView ) { connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) ); @@ -160,7 +160,7 @@ void KonqRun::scanFile() KParts::BrowserRun::scanFile(); // could be a static cast as of now, but who would notify when // BrowserRun changes - KIO::TransferJob *job = dynamic_cast<KIO::TransferJob*>( m_job ); + KIO::TransferJob *job = tqt_dynamic_cast<KIO::TransferJob*>( m_job ); if ( job && !job->error() ) { connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL& )), TQT_SLOT( slotRedirection( KIO::Job *, const KURL& ) )); diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 09d1a0b53..3fb199d88 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -218,7 +218,7 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other ) for (uint i = 0; i < m_pChildFrameList->count(); i++ ) { - m_pChildFrameList->at(i)->copyHistory( static_cast<KonqFrameTabs *>( other )->m_pChildFrameList->at(i) ); + m_pChildFrameList->tqat(i)->copyHistory( static_cast<KonqFrameTabs *>( other )->m_pChildFrameList->tqat(i) ); } } @@ -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->at(i); + child = m_pChildFrameList->tqat(i); if (child != 0L) child->printFrameInfo(spaces + " "); else @@ -322,7 +322,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame ) void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage ) { setTabColor( newPage, KGlobalSettings::textColor() ); - KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(newPage); + KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage); if (currentFrame && !m_pViewManager->isLoadingProfile()) { m_pActiveChild = currentFrame; @@ -346,11 +346,11 @@ void KonqFrameTabs::moveTabForward( int index ) void KonqFrameTabs::slotMovedTab( int from, int to ) { - KonqFrameBase* fromFrame = m_pChildFrameList->at( from ); + KonqFrameBase* fromFrame = m_pChildFrameList->tqat( from ); m_pChildFrameList->remove( fromFrame ); m_pChildFrameList->insert( to, fromFrame ); - KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>( currentPage() ); + KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>( currentPage() ); if ( currentFrame && !m_pViewManager->isLoadingProfile() ) { m_pActiveChild = currentFrame; currentFrame->activateChild(); @@ -383,11 +383,11 @@ void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p ) m_pPopupMenu->setItemEnabled( OTHERTABS_ID, tabCount>1 ); m_pSubPopupMenuTab->setItemEnabled( m_closeOtherTabsId, true ); - // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a + // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a // class hierarchy and it could crash one day, but I haven't checked // setWorkingTab so I don't know if it can handle nulls. - m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) ); + m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) ); m_pPopupMenu->exec( p ); } @@ -427,8 +427,8 @@ void KonqFrameTabs::refreshSubPopupMenuTab() void KonqFrameTabs::slotCloseRequest( TQWidget *w ) { if ( m_pChildFrameList->count() > 1 ) { - // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. - m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) ); + // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. + m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) ); emit ( removeTabPopup() ); } } @@ -440,8 +440,8 @@ void KonqFrameTabs::slotSubPopupMenuTabActivated( int _id) void KonqFrameTabs::slotMouseMiddleClick() { - TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection ); - KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); + TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection ); + KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { KonqView* newView = m_pViewManager->addTab(TQString::null, TQString::null, false, false); if (newView == 0L) return; @@ -455,16 +455,16 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w ) { if ( m_MouseMiddleClickClosesTab ) { if ( m_pChildFrameList->count() > 1 ) { - // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. - m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) ); + // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls. + m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) ); emit ( removeTabPopup() ); } } else { - TQApplication::tqclipboard()->setSelectionMode( QClipboard::Selection ); - KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) ); + TQApplication::tqclipboard()->setSelectionMode( TQClipboard::Selection ); + KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::tqclipboard()->text() ) ); if ( !filteredURL.isEmpty() ) { - KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w); + KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w); if (frame) { m_pViewManager->mainWindow()->openURL( frame->activeChildView(), filteredURL ); } @@ -494,7 +494,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e ) { KURL::List lstDragURLs; bool ok = KURLDrag::decode( e, lstDragURLs ); - KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w); + KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w); if ( ok && lstDragURLs.first().isValid() && frame ) { KURL lstDragURL = lstDragURLs.first(); if ( lstDragURL != frame->activeChildView()->url() ) @@ -504,7 +504,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e ) void KonqFrameTabs::slotInitiateDrag( TQWidget *w ) { - KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w ); + KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>( w ); if (frame) { KURL::List lst; lst.append( frame->activeChildView()->url() ); diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index e7f1bd7bf..d23982437 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -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.at() << endl; + kdDebug(1202) << "Current position : " << m_lstHistory.tqat() << endl; #endif } @@ -711,7 +711,7 @@ void KonqView::createHistoryEntry() #ifdef DEBUG_HISTORY kdDebug(1202) << "Truncating history" << endl; #endif - m_lstHistory.at( m_lstHistory.count() - 1 ); // go to last one + m_lstHistory.tqat( 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.at( m_lstHistory.count() - 1 ); + m_lstHistory.tqat( 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.at() << " count=" << m_lstHistory.count() << endl; + kdDebug(1202) << "at=" << m_lstHistory.tqat() << " count=" << m_lstHistory.count() << endl; #endif - assert( m_lstHistory.at() == (int) m_lstHistory.count() - 1 ); + assert( m_lstHistory.tqat() == (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.at() << endl; + kdDebug(1202) << "Saving part URL : " << m_pPart->url() << " in history position " << m_lstHistory.tqat() << 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.at() << endl; + kdDebug(1202) << "Saving location bar URL : " << m_sLocationBarURL << " in history position " << m_lstHistory.tqat() << endl; #endif current->locationBarURL = m_sLocationBarURL; current->pageSecurity = m_pageSecurity; } #ifdef DEBUG_HISTORY - kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.at() << endl; + kdDebug(1202) << "Saving title : " << m_caption << " in history position " << m_lstHistory.tqat() << endl; #endif current->title = m_caption; current->strServiceType = m_serviceType; @@ -800,7 +800,7 @@ void KonqView::go( int steps ) return; } - int newPos = m_lstHistory.at() + steps; + int newPos = m_lstHistory.tqat() + 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.at( newPos ); // sets current item + HistoryEntry *currentHistoryEntry = m_lstHistory.tqat( newPos ); // sets current item assert( currentHistoryEntry ); - assert( newPos == m_lstHistory.at() ); // check we moved (i.e. if I understood the docu) + assert( newPos == m_lstHistory.tqat() ); // check we moved (i.e. if I understood the docu) assert( currentHistoryEntry == m_lstHistory.current() ); #ifdef DEBUG_HISTORY - kdDebug(1202) << "New position " << m_lstHistory.at() << endl; + kdDebug(1202) << "New position " << m_lstHistory.tqat() << endl; #endif restoreHistory(); @@ -866,7 +866,7 @@ void KonqView::restoreHistory() m_pMainWindow->updateToolBarActions(); #ifdef DEBUG_HISTORY - kdDebug(1202) << "New position (2) " << m_lstHistory.at() << endl; + kdDebug(1202) << "New position (2) " << m_lstHistory.tqat() << 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.at(); - const HistoryEntry* h = m_lstHistory.at(pos); - m_lstHistory.at( oldpos ); + int oldpos = m_lstHistory.tqat(); + const HistoryEntry* h = m_lstHistory.tqat(pos); + m_lstHistory.tqat( 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.at(other->m_lstHistory.at()); + m_lstHistory.tqat(other->m_lstHistory.tqat()); } KURL KonqView::url() const diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 1329000f8..d251da53b 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.at() > 0; } + bool canGoBack()const { return m_lstHistory.tqat() > 0; } /** * @return true if view can go forward */ - bool canGoForward()const { return m_lstHistory.at() != ((int)m_lstHistory.count())-1; } + bool canGoForward()const { return m_lstHistory.tqat() != ((int)m_lstHistory.count())-1; } /** * @return the position in the history */ - int historyPos() const { return m_lstHistory.at(); } + int historyPos() const { return m_lstHistory.tqat(); } uint historyLength() { return m_lstHistory.count(); } @@ -149,7 +149,7 @@ public: */ void restoreHistory(); - void setHistoryPos(int newPos) { m_lstHistory.at( newPos ); } + void setHistoryPos(int newPos) { m_lstHistory.tqat( newPos ); } /** * @return the history of this view diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 86fb3d478..d2600adf1 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -132,7 +132,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, //printSizeInfo( splitFrame, parentContainer, "before split"); #endif - parentContainer->widget()->setUpdatesEnabled( false ); + parentContainer->widget()->tqsetUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = splitFrame->widget()->pos(); @@ -184,7 +184,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, //newView->frame()->show(); newContainer->show(); - parentContainer->widget()->setUpdatesEnabled( true ); + parentContainer->widget()->tqsetUpdatesEnabled( true ); if (m_pDocContainer == splitFrame) m_pDocContainer = newContainer; @@ -226,7 +226,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, KonqFrameBase* mainFrame = m_pMainWindow->childFrame(); - mainFrame->widget()->setUpdatesEnabled( false ); + mainFrame->widget()->tqsetUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = mainFrame->widget()->pos(); @@ -249,7 +249,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, newContainer->show(); - mainFrame->widget()->setUpdatesEnabled( true ); + mainFrame->widget()->tqsetUpdatesEnabled( true ); if( childView ) childView->openURL( url, locationBarURL ); @@ -279,7 +279,7 @@ void KonqViewManager::convertDocContainer() splitterSizes = static_cast<KonqFrameContainer*>(parentContainer)->sizes(); } - parentContainer->widget()->setUpdatesEnabled( false ); + parentContainer->widget()->tqsetUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = m_pDocContainer->widget()->pos(); @@ -302,7 +302,7 @@ void KonqViewManager::convertDocContainer() newContainer->show(); - parentContainer->widget()->setUpdatesEnabled( true ); + parentContainer->widget()->tqsetUpdatesEnabled( true ); m_pDocContainer = newContainer; } @@ -410,7 +410,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KonqFrameBase* currentFrame; if ( tab == 0L ) - currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); else currentFrame = tab; @@ -451,7 +451,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag else tabContainer->setCurrentPage( tabContainer->count() - 1 ); - KonqFrameBase* duplicatedFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + KonqFrameBase* duplicatedFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); if (duplicatedFrame) duplicatedFrame->copyHistory( currentFrame ); @@ -480,7 +480,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KonqFrameBase* currentFrame; if ( tab == 0L ) - currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); else currentFrame = tab; @@ -508,7 +508,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) if( newDocContainer && newDocContainer->frameType() == "Tabs") { KonqFrameTabs *kft = static_cast<KonqFrameTabs *>(newDocContainer); - KonqFrameBase *newFrame = dynamic_cast<KonqFrameBase*>(kft->currentPage()); + KonqFrameBase *newFrame = tqt_dynamic_cast<KonqFrameBase*>(kft->currentPage()); if(newFrame) newFrame->copyHistory( currentFrame ); } @@ -553,7 +553,7 @@ void KonqViewManager::removeTab( KonqFrameBase* tab ) if ( tab != 0L ) { currentFrame = tab; } else { - currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); if (!currentFrame) { return; } @@ -622,7 +622,7 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab ) KonqFrameBase *currentFrame; if ( tab == 0L ) - currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); + currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage()); else currentFrame = tab; @@ -784,7 +784,7 @@ void KonqViewManager::removeView( KonqView *view ) if (m_pDocContainer == parentContainer) m_pDocContainer = otherFrame; - grandParentContainer->widget()->setUpdatesEnabled( false ); + grandParentContainer->widget()->tqsetUpdatesEnabled( false ); static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted(); //kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl; @@ -826,7 +826,7 @@ void KonqViewManager::removeView( KonqView *view ) grandParentContainer->setActiveChild( otherFrame ); grandParentContainer->activateChild(); - grandParentContainer->widget()->setUpdatesEnabled( true ); + grandParentContainer->widget()->tqsetUpdatesEnabled( true ); } else if (parentContainer->frameType()=="Tabs") { kdDebug(1202) << "parentContainer " << parentContainer << " is a KonqFrameTabs" << endl; @@ -1611,8 +1611,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; - loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL ); - loadItem( cfg, newContainer, childList.at(1), defaultURL, openURL ); + loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL ); + loadItem( cfg, newContainer, childList.tqat(1), defaultURL, openURL ); newContainer->setSizes( sizes ); @@ -1642,7 +1642,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, loadItem( cfg, newContainer, *it, defaultURL, openURL ); TQWidget* currentPage = newContainer->currentPage(); if (currentPage != 0L) { - KonqView* activeChildView = dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView(); + KonqView* activeChildView = tqt_dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView(); if (activeChildView != 0L) { activeChildView->setCaption( activeChildView->caption() ); activeChildView->setTabIcon( activeChildView->url() ); @@ -1650,7 +1650,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, } } - newContainer->setActiveChild( dynamic_cast<KonqFrameBase*>(newContainer->page(index)) ); + newContainer->setActiveChild( tqt_dynamic_cast<KonqFrameBase*>(newContainer->page(index)) ); newContainer->setCurrentPage( index ); newContainer->show(); diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/khtmlkttsd.cpp index e832bd27a..1ddba4d93 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.at(0); // reset data + dataBuf.tqat(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.at(0); + dataBuf.tqat(0); arg << 0; if ( !client->call("kttsd", "KSpeech", "startText(uint)", data, replyType, replyData, true) ) diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 135e11a09..eb11d0c22 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -181,8 +181,8 @@ void KonqInfoListViewWidget::rebuildView() if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } } @@ -215,8 +215,8 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 3307073de..a01a7aa2c 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.at(0)=='*' && pattern.tqfind('*',1)==-1) + if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.tqfind('*',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 a66dbb06c..a8f92c0d3 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -234,7 +234,7 @@ const TQPixmap* KonqListViewItem::pixmap( int column ) const if ((int)m_pixmaps.count() <= column) return 0; - TQPixmap *pm = m_pixmaps.at( column, &ok ); + TQPixmap *pm = m_pixmaps.tqat( column, &ok ); if( !ok ) return 0; return pm; diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index d61518767..a39796579 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.at(i) ) + if ( confColumns[j].name == *lstColumns.tqat(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.at(i); + confColumns[j].width = *lstColumnWidths.tqat(i); else { // Default Column widths @@ -984,7 +984,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) if (_item->pixmap(0) != 0) { - // Rect of the QListViewItem's pixmap area. + // Rect of the TQListViewItem's pixmap area. TQRect rect = _item->listView()->tqitemRect(_item); // calculate nesting depth @@ -1192,8 +1192,8 @@ void KonqBaseListViewWidget::setComplete() if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } @@ -1237,8 +1237,8 @@ void KonqBaseListViewWidget::slotClear() m_pBrowserView->resetCount(); m_pBrowserView->lstPendingMimeIconItems().clear(); - viewport()->setUpdatesEnabled( false ); - setUpdatesEnabled( false ); + viewport()->tqsetUpdatesEnabled( false ); + tqsetUpdatesEnabled( false ); clear(); } @@ -1268,8 +1268,8 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); @@ -1301,7 +1301,7 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem ) } delete &(*it); - // HACK HACK HACK: QListViewItem/KonqBaseListViewItem should + // HACK HACK HACK: TQListViewItem/KonqBaseListViewItem should // take care and the source looks like it does; till the // real bug is found, this fixes some crashes (malte) emit selectionChanged(); @@ -1314,8 +1314,8 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem ) // OK, but this code also gets activated when deleting a hidden file... (dfaure) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 7d57c202f..0ad11fc17 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -80,6 +80,7 @@ class KonqBaseListViewWidget : public KListView friend class ListViewBrowserExtension; Q_OBJECT + TQ_OBJECT public: KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); virtual ~KonqBaseListViewWidget(); @@ -161,7 +162,7 @@ public slots: protected slots: void slotAutoScroll(); - // from QListView + // from TQListView virtual void slotReturnPressed( TQListViewItem *_item ); virtual void slotCurrentChanged( TQListViewItem *_item ) { slotOnItem( _item ); } diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc index f3e9140d3..2012b6480 100644 --- a/konqueror/listview/konq_textviewwidget.cc +++ b/konqueror/listview/konq_textviewwidget.cc @@ -101,8 +101,8 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); @@ -146,8 +146,8 @@ void KonqTextViewWidget::setComplete() if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } } diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 5fefc8133..1f19cf979 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -121,8 +121,8 @@ void KonqTreeViewWidget::slotCompleted( const KURL & _url ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } } @@ -268,8 +268,8 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->setUpdatesEnabled( true ); - setUpdatesEnabled( true ); + viewport()->tqsetUpdatesEnabled( true ); + tqsetUpdatesEnabled( true ); triggerUpdate(); } diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index f8ca47992..596408d88 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -55,7 +55,7 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, m_menu->setEnabled(false); m_menu->setDelayed(false); - m_part = dynamic_cast<KonqDirPart*>(parent); + m_part = tqt_dynamic_cast<KonqDirPart*>(parent); if (m_part) // if parent is not a KonqDirPart, our menu will never show TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()), diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index 7c39fb826..66dd0b7bb 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -39,7 +39,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, void KShellCmdPlugin::slotExecuteShellCommand() { - KonqDirPart * part = dynamic_cast<KonqDirPart *>(parent()); + KonqDirPart * part = tqt_dynamic_cast<KonqDirPart *>(parent()); if ( !part ) { KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug."); diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 2724b2d39..0d8bf89ea 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -37,6 +37,7 @@ class KonqSidebarFactory; class KonqSidebarBrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: KonqSidebarBrowserExtension(KonqSidebar *part_,Sidebar_Widget *widget_,const char *name): KParts::BrowserExtension((KParts::ReadOnlyPart*)part_,name),widget(widget_){;} @@ -73,6 +74,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension class KonqSidebar : public KParts::ReadOnlyPart, public KonqSidebarIface { Q_OBJECT + TQ_OBJECT public: /** * Default constructor @@ -110,6 +112,7 @@ class KAboutData; class KonqSidebarFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: KonqSidebarFactory(); virtual ~KonqSidebarFactory(); diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index 1839425dc..0f3fdddde 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {} bool KonqSidebarPlugin::universalMode() { if (!parent()) return false; - KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->tqqt_cast("KonqSidebarIface")); + KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->qt_cast("KonqSidebarIface")); if (!ksi) return false; kdDebug()<<"calling KonqSidebarIface->universalMode()"<<endl; return ksi->universalMode(); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 50163c46a..e69504367 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -178,13 +178,13 @@ void addBackEnd::activatedAddMenu(int id) KLibLoader *loader = KLibLoader::self(); // try to load the library - TQString libname = *libNames.at(id); + TQString libname = *libNames.tqat(id); KLibrary *lib = loader->library(TQFile::encodeName(libname)); if (lib) { // get the create_ function TQString factory("add_"); - factory = factory+(*libNames.at(id)); + factory = factory+(*libNames.tqat(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.at(id),&map)) + if (func(tmp,libParam.tqat(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.at(id) + kdWarning() << "libname:" << libNames.tqat(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.at(i); + ButtonInfo *button = m_buttons.tqat(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.at(tmpLatestViewed); + ButtonInfo *button = m_buttons.tqat(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.at(i); + ButtonInfo *button = m_buttons.tqat(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.at(i); + ButtonInfo *button = m_buttons.tqat(i); if (m_openViews.tqcontains(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.at(i)->file==url.path()) + if (m_buttons.tqat(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.at(i); + ButtonInfo *button = m_buttons.tqat(i); if (button->dock) { if ((button->dock->isVisibleTo(this)) && (button->module)) @@ -836,7 +836,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) { - KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj); + KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj); if (bt) { kdDebug()<<"Request for popup"<<endl; @@ -845,7 +845,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { if (bt==m_buttonBar->tab(i)) { - m_currentButton = m_buttons.at(i); + m_currentButton = m_buttons.tqat(i); break; } } @@ -953,7 +953,7 @@ bool Sidebar_Widget::createView( ButtonInfo *data) void Sidebar_Widget::showHidePage(int page) { - ButtonInfo *info = m_buttons.at(page); + ButtonInfo *info = m_buttons.tqat(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.at(i); + ButtonInfo *button = m_buttons.tqat(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.at(i); + ButtonInfo *button = m_buttons.tqat(i); if (button->dock) button->dock->undock(); } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index e79ed82df..b0d818c62 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -413,9 +413,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation() if ( !bookmark.isGroup() ) { kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), - QClipboard::Selection ); + TQClipboard::Selection ); kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), - QClipboard::Clipboard ); + TQClipboard::Clipboard ); } } @@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo item->setOpen(false); } else if ( bk.isSeparator() ) - item->setVisible( false ); + item->tqsetVisible( false ); else item->setExpandable( false ); } diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 9b342f20e..404a2f2c5 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation() { if (!m_currentTopLevelItem) return; KURL url = m_currentTopLevelItem->externalURL(); - kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection ); - kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard ); + kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); + kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); } /////////////////////////////////////////////////////////////////// diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 2711c723a..fc53039b6 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -150,7 +150,7 @@ extern "C" { int id=names.tqfindIndex( item ); if (id==-1) return false; - KSimpleConfig ksc2(*list.at(id)); + KSimpleConfig ksc2(*list.tqat(id)); ksc2.setGroup("Desktop Entry"); map->insert("Type","Link"); map->insert("Icon",ksc2.readEntry("Icon")); diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 6a97e46cd..fb0a64376 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -389,7 +389,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) // konsole in opaque mode. bY = bX = 1; - cb = TQApplication::clipboard(); + cb = TQApplication::tqclipboard(); TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(onClearSelection()) ); @@ -562,7 +562,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, int w; for(unsigned int i=0;i<str.length();i++) { - drawstr = str.at(i); + drawstr = str.tqat(i); // Add double of the width if next c is 0; if ((attr+nc+1)->c) // This may access image[image_size] See makeImage() { @@ -615,8 +615,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { if (pm) paint.setBackgroundMode( Qt::TransparentMode ); - if (clear || (blinking && (attr->r & RE_BLINK))) + if (clear || (blinking && (attr->r & RE_BLINK))) { +#ifdef USE_QT4 + paint.eraseRect(rect); +#else // USE_QT4 erase(rect); +#endif // USE_QT4 + } } else { @@ -807,7 +812,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) int y,x,len; const TQPixmap* pm = backgroundPixmap(); TQPainter paint; - setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); paint.begin( this ); TQPoint tL = contentsRect().topLeft(); @@ -919,7 +924,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) } drawFrame( &paint ); paint.end(); - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; } free(dirtyMask); @@ -986,7 +991,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) { const TQPixmap* pm = backgroundPixmap(); TQPainter paint; - setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); paint.begin( this ); paint.setBackgroundMode( Qt::TransparentMode ); @@ -1044,7 +1049,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) erase( er ); paint.end(); - setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); } void TEWidget::print(TQPainter &paint, bool friendly, bool exact) @@ -2261,7 +2266,7 @@ void TEWidget::dropEvent(TQDropEvent* event) void TEWidget::doDrag() { dragInfo.state = diDragging; - dragInfo.dragObject = new TQTextDrag(TQApplication::clipboard()->text(QClipboard::Selection), this); + dragInfo.dragObject = new TQTextDrag(TQApplication::tqclipboard()->text(TQClipboard::Selection), this); dragInfo.dragObject->dragCopy(); // Don't delete the TQTextDrag object. Qt will delete it when it's done with it. } diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index 514db41d5..afb1ff3a8 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -44,6 +44,7 @@ class TEWidget : public TQFrame // a widget representing attributed text { Q_OBJECT + TQ_OBJECT friend class Konsole; public: @@ -165,7 +166,7 @@ signals: void endSelectionSignal(const bool preserve_line_breaks); void isBusySelecting(bool); void testIsSelected(const int x, const int y, bool &selected /* result */); - void sendStringToEmu(const char*); + void sendStringToEmu(const char*); protected: @@ -265,7 +266,7 @@ private: bool preserve_line_breaks; bool column_selection_mode; - QClipboard* cb; + TQClipboard* cb; TQScrollBar* scrollbar; int scrollLoc; TQString word_characters; diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index e136c3c38..af779e0b8 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -392,7 +392,7 @@ void TEmulation::clearSelection() { void TEmulation::copySelection() { if (!connected) return; TQString t = scr->getSelText(true); - TQApplication::clipboard()->setText(t); + TQApplication::tqclipboard()->setText(t); } TQString TEmulation::getSelection() { diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index de35d49ff..bcf5228c7 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -360,7 +360,10 @@ void KeyTrans::readConfig() TQCString txt = #include "default.keytab.h" ; - buf=TQT_TQIODEVICE(new TQBuffer(txt)); + TQBuffer* newbuf; + newbuf = new TQBuffer(); + newbuf->tqsetBufferFromCopy(txt); + buf=TQT_TQIODEVICE(newbuf); } else { diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 37f53bfb6..d55042671 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -1305,7 +1305,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos) if (!m_menuCreated) makeGUI(); - m_contextMenuSession = sessions.at( tabwidget->indexOf( _te ) ); + m_contextMenuSession = sessions.tqat( tabwidget->indexOf( _te ) ); m_tabDetachSession->setEnabled( tabwidget->count()>1 ); @@ -1376,12 +1376,12 @@ void Konsole::slotTabSetViewOptions(int mode) for(int i = 0; i < tabwidget->count(); i++) { TQWidget *page = tabwidget->page(i); - TQIconSet icon = iconSetForSession(sessions.at(i)); + TQIconSet icon = iconSetForSession(sessions.tqat(i)); TQString title; if (b_matchTabWinTitle) - title = sessions.at(i)->fullTitle(); + title = sessions.tqat(i)->fullTitle(); else - title = sessions.at(i)->Title(); + title = sessions.tqat(i)->Title(); title=title.tqreplace('&',"&&"); switch(mode) { @@ -1614,7 +1614,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->at(0); //the default one + sch = (ColorSchema*)colors->tqat(0); //the default one kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl; s_kconfigSchema = sch->relPath(); } @@ -1872,7 +1872,7 @@ void Konsole::updateSchemaMenu() m_schema->clear(); for (int i = 0; i < (int) colors->count(); i++) { - ColorSchema* s = (ColorSchema*)colors->at(i); + ColorSchema* s = (ColorSchema*)colors->tqat(i); assert( s ); TQString title=s->title(); m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); @@ -2115,7 +2115,7 @@ void Konsole::reparseConfiguration() ColorSchema* sch = colors->find(s_kconfigSchema); if (!sch) { - sch = (ColorSchema*)colors->at(0); //the default one + sch = (ColorSchema*)colors->tqat(0); //the default one kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl; s_kconfigSchema = sch->relPath(); } @@ -2486,7 +2486,7 @@ TQString Konsole::sessionId(const int position) if (position<=0 || position>(int)sessions.count()) return ""; - return sessions.at(position-1)->SessionId(); + return sessions.tqat(position-1)->SessionId(); } void Konsole::listSessions() @@ -2512,7 +2512,7 @@ void Konsole::activateSession(int position) { if (position<0 || position>=(int)sessions.count()) return; - activateSession( sessions.at(position) ); + activateSession( sessions.tqat(position) ); } void Konsole::activateSession(TQWidget* w) @@ -2572,7 +2572,7 @@ 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->at(0); //the default one + cs = (ColorSchema*)colors->tqat(0); //the default one s_schema = cs->relPath(); curr_schema = cs->numb(); pmPath = cs->imagePath(); @@ -2618,7 +2618,7 @@ void Konsole::activateSession(TESession *s) if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() ); masterMode->setChecked( se->isMasterMode() ); sessions.tqfind(se); - uint position=sessions.at(); + uint position=sessions.tqat(); if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0); if (m_moveSessionRight) m_moveSessionRight->setEnabled(position<sessions.count()-1); } @@ -2857,7 +2857,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis ColorSchema* schema = colors->find(sch); if (!schema) - schema=(ColorSchema*)colors->at(0); //the default one + schema=(ColorSchema*)colors->tqat(0); //the default one int schmno = schema->numb(); if (sessions.count()==1 && n_tabbar!=TabNone) @@ -3049,7 +3049,7 @@ void Konsole::doneSession(TESession* s) se = 0; if (sessions.count()) { - se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); + se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0); session2action.tqfind(se)->setChecked(true); //FIXME: this Timer stupidity originated from the connected @@ -3067,7 +3067,7 @@ void Konsole::doneSession(TESession* s) } else { sessions.tqfind(se); - uint position=sessions.at(); + uint position=sessions.tqat(); m_moveSessionLeft->setEnabled(position>0); m_moveSessionRight->setEnabled(position<sessions.count()-1); } @@ -3121,7 +3121,7 @@ void Konsole::slotMovedTab(int from, int to) void Konsole::moveSessionLeft() { sessions.tqfind(se); - uint position=sessions.at(); + uint position=sessions.tqat(); if (position==0) return; @@ -3153,7 +3153,7 @@ void Konsole::moveSessionLeft() void Konsole::moveSessionRight() { sessions.tqfind(se); - uint position=sessions.at(); + uint position=sessions.tqat(); if (position==sessions.count()-1) return; @@ -3556,7 +3556,7 @@ void Konsole::setSchema(int numb, TEWidget* tewidget) ColorSchema* s = colors->find(numb); if (!s) { - s = (ColorSchema*)colors->at(0); + s = (ColorSchema*)colors->tqat(0); kdWarning() << "No schema with serial #"<<numb<<", using "<<s->relPath()<<" (#"<<s->numb()<<")." << endl; s_kconfigSchema = s->relPath(); } @@ -3573,7 +3573,7 @@ void Konsole::setSchema(const TQString & path) ColorSchema* s = colors->find(path); if (!s) { - s = (ColorSchema*)colors->at(0); //the default one + s = (ColorSchema*)colors->tqat(0); //the default one kdWarning() << "No schema with the name " <<path<<", using "<<s->relPath()<<endl; s_kconfigSchema = s->relPath(); } @@ -3704,7 +3704,7 @@ void Konsole::detachSession(TESession* _se) { if (se_previous) se = se_previous; else - se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); + se = sessions.tqat(sessionIndex ? sessionIndex - 1 : 0); session2action.tqfind(se)->setChecked(true); TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); } diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index d4b1d4627..a2594edc1 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->at(0); //the default one + sch=(ColorSchema*)colors->tqat(0); //the default one } if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile(); s_schema = sch->relPath(); @@ -731,7 +731,7 @@ void konsolePart::updateSchemaMenu() m_schema->clear(); for (int i = 0; i < (int) colors->count(); i++) { - ColorSchema* s = (ColorSchema*)colors->at(i); + ColorSchema* s = (ColorSchema*)colors->tqat(i); TQString title=s->title(); m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); } @@ -746,7 +746,7 @@ void konsolePart::setSchema(int numb) ColorSchema* s = colors->find(numb); if (!s) { kdWarning() << "No schema found. Using default." << endl; - s=(ColorSchema*)colors->at(0); + s=(ColorSchema*)colors->tqat(0); } if (s->numb() != numb) { kdWarning() << "No schema with number " << numb << endl; diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 0a1fb4cc1..de48e3cbd 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -187,6 +187,10 @@ public: uint count() const { return TQPtrList<ColorSchema>::count(); } ; const ColorSchema *at(unsigned int i) { return TQPtrList<ColorSchema>::at(i); } ; +#ifdef USE_QT4 + const ColorSchema *tqat(unsigned int i) + { return at(i); ; +#endif // USE_QT4 void sort() {TQPtrList<ColorSchema>::sort();}; diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 04f6e49da..214d95cd3 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -428,12 +428,12 @@ void KStylePage::getAvailability() { else if (*it == "Light, 3rd revision") kde_light_exist = true; } // and disable the ListItems, if they are not. - if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false); - if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false); - if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false); - if (!cde_exist) cde->setVisible(false); - if (!win_exist) win->setVisible(false); - if (!platinum_exist) platinum->setVisible(false); + if ( !(kde_plastik_exist || kde_light_exist) ) kde->tqsetVisible(false); + if ( !(kde_hc_exist || kde_def_exist) ) classic->tqsetVisible(false); + if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->tqsetVisible(false); + if (!cde_exist) cde->tqsetVisible(false); + if (!win_exist) win->tqsetVisible(false); + if (!platinum_exist) platinum->tqsetVisible(false); // test, wich KWin-styles are available kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index 014e6d489..15b30fbf9 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -104,7 +104,7 @@ void KSysInfo::initFontFamilies() { m_fixed_font = TQString::null; int normal_priority = 0, fixed_priority = 0; for (uint i=0; i < families.count(); i++) { - TQString font = *families.at(i); + TQString font = *families.tqat(i); //add further NORMAL fonts here if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index d6b54c8d5..322890590 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -201,7 +201,7 @@ int main(int argc, char *argv[]) KRandomSequence rnd; int indx = rnd.getLong(saverFileList.count()); - TQString filename = *(saverFileList.at(indx)); + TQString filename = *(saverFileList.tqat(indx)); KDesktopFile config(filename, true); diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am index 8f1e8ac93..1e7790109 100644 --- a/ksplashml/themeengine/simple/Makefile.am +++ b/ksplashml/themeengine/simple/Makefile.am @@ -4,4 +4,4 @@ INCLUDES = $(all_includes) bin_PROGRAMS = ksplashsimple ksplashsimple_SOURCES = main.cpp ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) +ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT) diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index 79d8f5961..1980c3762 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.at( idx ) ); + footers.remove( footers.tqat( idx ) ); update(); return true; diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index e2b3917f5..7163f9b99 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().at( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); + entry << sensors().tqat( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); entry << mPlotter->footers[ i ]; - entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); - entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); + entry << ( sensors().tqat( 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().at( i )->hostName() && - (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ) ) { + if ( (*it)[ 0 ] == sensors().tqat( i )->hostName() && + (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ) ) { mPlotter->footers[ i ] = (*it)[ 2 ]; found = true; break; @@ -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().at( i )->hostName() ) - .arg( sensors().at( i )->name() ); + .arg( sensors().tqat( i )->hostName() ) + .arg( sensors().tqat( 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().at( i )->hostName() ) - .arg( sensors().at( i )->name() ); + .arg( sensors().tqat( i )->hostName() ) + .arg( sensors().tqat( 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().at( id - 100 )->setUnit( info.unit() ); + sensors().tqat( 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().at( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().at( i )->name() ); - beam.setAttribute( "sensorType", sensors().at( i )->type() ); + beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); + beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); beam.setAttribute( "sensorDescr", mPlotter->footers[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc index 1b97cc25f..b1e6fc0d5 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc @@ -48,7 +48,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 ); + TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 1 ); mTitle = new KLineEdit( groupBox ); TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) ); @@ -57,7 +57,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 5 ); boxLayout->setColStretch( 2, 1 ); TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox ); @@ -85,7 +85,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); @@ -103,7 +103,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 65a9ec809..09a6e7a94 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().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 << 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 << ( 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().at( 0 )->hostName() ) { + if ( mBeams > 0 && hostName != sensors().tqat( 0 )->hostName() ) { KMessageBox::sorry( this, TQString( "All sensors of this display need " "to be from the host %1!" ) - .arg( sensors().at( 0 )->hostName() ) ); + .arg( sensors().tqat( 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().at( mBeams - i - 1 )->hostName() ) - .arg( sensors().at( mBeams - i - 1 )->name() ); + .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) + .arg( sensors().tqat( 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().at( mBeams - i - 1 )->hostName() ) - .arg( sensors().at( mBeams - i - 1 )->name() ); + .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) + .arg( sensors().tqat( 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().at( id - 100 )->setUnit( info.unit() ); + sensors().tqat( 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().at( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().at( i )->name() ); - beam.setAttribute( "sensorType", sensors().at( i )->type() ); + beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); + beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); saveColor( beam, "color", mPlotter->beamColors()[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 95587dde6..ad5687144 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -79,7 +79,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 2, 1 ); mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox ); @@ -109,7 +109,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2, spacingHint() ); boxLayout->setRowStretch( 1, 1 ); mHorizontalScale = new KIntNumInput( 1, groupBox ); @@ -127,7 +127,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox ); @@ -166,7 +166,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 3, 4, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox ); @@ -191,7 +191,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 1, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 4, 2, spacingHint() ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); boxLayout->addWidget( label, 0, 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index dbd11a7b5..e9fc17c24 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -116,8 +116,8 @@ PrivateListView::PrivateListView(TQWidget *parent, const char *name) void PrivateListView::update(const TQString& answer) { - setUpdatesEnabled(false); - viewport()->setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); + viewport()->tqsetUpdatesEnabled(false); int vpos = verticalScrollBar()->value(); int hpos = horizontalScrollBar()->value(); @@ -143,8 +143,8 @@ void PrivateListView::update(const TQString& answer) verticalScrollBar()->setValue(vpos); horizontalScrollBar()->setValue(hpos); - viewport()->setUpdatesEnabled(true); - setUpdatesEnabled(true); + viewport()->tqsetUpdatesEnabled(true); + tqsetUpdatesEnabled(true); triggerUpdate(); } @@ -239,7 +239,7 @@ ListView::addSensor(const TQString& hostName, const TQString& sensorName, const void ListView::updateList() { - sendRequest(sensors().at(0)->hostName(), sensors().at(0)->name(), 19); + sendRequest(sensors().tqat(0)->hostName(), sensors().tqat(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().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(0)->type()); TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index 575ca6919..bd74ff2c0 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().at(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); + sendRequest(sensors().tqat(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.tqfindRev("/") + 1)); - sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); + sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); if (title.isEmpty()) - setTitle(sensors().at(0)->hostName() + ":" + sensorID); + setTitle(sensors().tqat(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().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(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().at(0)->hostName(), - TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19); + sendRequest(sensors().tqat(0)->hostName(), + TQString("%1 %2" ).arg(sensors().tqat(0)->name()).arg(logFileID), 19); } void diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 3a54aefd3..7050decde 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().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(0)->type()); element.setAttribute("showUnit", showUnit()); element.setAttribute("lowerLimitActive", (int) lowerLimitActive); element.setAttribute("lowerLimit", (int) lowerLimit); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 90f86a0e8..0438c0eb8 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().at(0)->hostName(), "ps", 2); + sendRequest(sensors().tqat(0)->hostName(), "ps", 2); } void ProcessController::killProcess(int pid, int sig) { - sendRequest(sensors().at(0)->hostName(), + sendRequest(sensors().tqat(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().at(0)->hostName(), TQString("kill %1 %2" ).arg(*it) + sendRequest(sensors().tqat(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().at(0)->hostName(), + sendRequest(sensors().tqat(0)->hostName(), TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5); - sendRequest(sensors().at(0)->hostName(), "ps", 2); //update the display afterwards + sendRequest(sensors().tqat(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().at(0)->isOk()) + if (err == sensors().tqat(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().at(0)->hostName(), "test kill", 4); - sendRequest(sensors().at(0)->hostName(), "ps?", 1); - sendRequest(sensors().at(0)->hostName(), "ps", 2); + sendRequest(sensors().tqat(0)->hostName(), "test kill", 4); + sendRequest(sensors().tqat(0)->hostName(), "ps?", 1); + sendRequest(sensors().tqat(0)->hostName(), "ps", 2); } /* This happens only when the sensorOk status needs to be changed. */ - sensors().at(0)->setIsOk( !err ); + sensors().tqat(0)->setIsOk( !err ); } - setSensorOk(sensors().at(0)->isOk()); + setSensorOk(sensors().tqat(0)->isOk()); } bool @@ -452,9 +452,9 @@ ProcessController::restoreSettings(TQDomElement& element) bool ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(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 cc5ca3266..278e837c8 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -297,8 +297,8 @@ ProcessList::update(const TQString& list) /* Disable painting to avoid flickering effects, * especially when in tree view mode. * Ditto for the scrollbar. */ - setUpdatesEnabled(false); - viewport()->setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); + viewport()->tqsetUpdatesEnabled(false); pl.clear(); @@ -349,8 +349,8 @@ ProcessList::update(const TQString& list) horizontalScrollBar()->setValue(hpos); // Re-enable painting, and force an update. - setUpdatesEnabled(true); - viewport()->setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); + viewport()->tqsetUpdatesEnabled(true); triggerUpdate(); @@ -532,8 +532,8 @@ ProcessList::deleteLeaves(void) { unsigned int i; for (i = 0; i < pl.count() && - (!isLeafProcess(pl.at(i)->pid()) || - matchesFilter(pl.at(i))); i++) + (!isLeafProcess(pl.tqat(i)->pid()) || + matchesFilter(pl.tqat(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.at(i)->ppid() == pid) + if (pl.tqat(i)->ppid() == pid) return (false); return (true); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index dca7163b8..0348abfe1 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.at( sensorId )->isOk() ) { + if ( err == mSensors.tqat( sensorId )->isOk() ) { // this happens only when the sensorOk status needs to be changed. - mSensors.at( sensorId )->setIsOk( !err ); + mSensors.tqat( sensorId )->setIsOk( !err ); } bool ok = true; for ( uint i = 0; i < mSensors.count(); ++i ) - if ( !mSensors.at( i )->isOk() ) { + if ( !mSensors.tqat( 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.at(orderOfSensors[i] )); + newSensors.append( mSensors.tqat(orderOfSensors[i] )); } mSensors.setAutoDelete( false ); diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 70d4d1900..48cc5489d 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.at(newIndex)); - newBeamColor.append(*mBeamColor.at(newIndex)); + newBeamData.append(mBeamData.tqat(newIndex)); + newBeamColor.append(*mBeamColor.tqat(newIndex)); } mBeamData = newBeamData; mBeamColor = newBeamColor; @@ -159,7 +159,7 @@ TQValueList<TQColor> &SignalPlotter::beamColors() void SignalPlotter::removeBeam( uint pos ) { - mBeamColor.remove( mBeamColor.at( pos ) ); + mBeamColor.remove( mBeamColor.tqat( 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.at( i ) + + memcpy( nd + ( newSampleNum - overlap ), mBeamData.tqat( i ) + ( mSamples - overlap ), overlap * sizeof( double ) ); double *p = mBeamData.take( i ); diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index f3d9e240e..53737fdaa 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -241,7 +241,7 @@ void WorkSheet::cut() if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) return; - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setText( currentDisplayAsXML() ); @@ -253,7 +253,7 @@ void WorkSheet::copy() if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) return; - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setText( currentDisplayAsXML() ); } @@ -264,7 +264,7 @@ void WorkSheet::paste() if ( !currentDisplay( &row, &column ) ) return; - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); TQDomDocument doc; /* Get text from clipboard and check for a valid XML header and diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index f14e462a2..aaa0c77b2 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -46,10 +46,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - group->layout()->setMargin( marginHint() ); - group->layout()->setSpacing( spacingHint() ); + group->tqlayout()->setMargin( marginHint() ); + group->tqlayout()->setSpacing( spacingHint() ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); groupLayout->tqsetAlignment( Qt::AlignTop ); mSheetTitle = new KLineEdit( group ); @@ -58,10 +58,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) topLayout->addWidget( group ); group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); - group->layout()->setMargin( marginHint() ); - group->layout()->setSpacing( spacingHint() ); + group->tqlayout()->setMargin( marginHint() ); + group->tqlayout()->setSpacing( spacingHint() ); - groupLayout = new TQGridLayout( group->layout(), 3, 2 ); + groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); groupLayout->tqsetAlignment( Qt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index c5250a3cb..0f87323d4 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -59,7 +59,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, i18n( "Connection Type" ), page ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, spacingHint() ); groupLayout->tqsetAlignment( Qt::AlignTop ); diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index d05af4ec8..67a0ccbee 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.at( pos ); + return *mSensorColors.tqat( pos ); else return dummy; } diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 6c7faf771..34f33a43d 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.at( i ) ); + pm.fill( *list.tqat( i ) ); mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) ); } } diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE index e63455e4f..8f3222f9b 100644 --- a/kwin/COMPLIANCE +++ b/kwin/COMPLIANCE @@ -164,7 +164,7 @@ version 2.0 + 2.8. kmanagerselection.* in kdecore + 2. (rest of the section) Not a KWin thing. -* - patch sent to TT to make QClipboard sufficiently compliant +* - patch sent to TT to make TQClipboard sufficiently compliant + 3. Feature not supported, obsolete. + 4.1.1 diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 67f197fd9..b5736fcce 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -167,7 +167,7 @@ void ButtonSource::hideAllButtons() { TQListViewItemIterator it(this); while (it.current() ) { - it.current()->setVisible(false); + it.current()->tqsetVisible(false); ++it; } } @@ -176,7 +176,7 @@ void ButtonSource::showAllButtons() { TQListViewItemIterator it(this); while (it.current() ) { - it.current()->setVisible(true); + it.current()->tqsetVisible(true); ++it; } } @@ -187,7 +187,7 @@ void ButtonSource::showButton( TQChar btn ) while (it.current() ) { ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() ); if (item && item->button().type == btn) { - it.current()->setVisible(true); + it.current()->tqsetVisible(true); return; } ++it; @@ -200,7 +200,7 @@ void ButtonSource::hideButton( TQChar btn ) while (it.current() ) { ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() ); if (item && item->button().type == btn && !item->button().duplicate) { - it.current()->setVisible(false); + it.current()->tqsetVisible(false); return; } ++it; diff --git a/kwin/manage.cpp b/kwin/manage.cpp index dc05e5e2c..c50a504d0 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -573,9 +573,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr ) attr.depth, InputOutput, attr.visual, CWColormap | CWBackPixmap | CWBorderPixel, &swa ); - XDefineCursor( qt_xdisplay(), frame, TQCursor(tqarrowCursor).handle()); + XDefineCursor( qt_xdisplay(), frame, tqarrowCursor.handle()); // some apps are stupid and don't define their own cursor - set the arrow one for them - XDefineCursor( qt_xdisplay(), wrapper, TQCursor(tqarrowCursor).handle()); + XDefineCursor( qt_xdisplay(), wrapper, tqarrowCursor.handle()); XReparentWindow( qt_xdisplay(), client, wrapper, 0, 0 ); XSelectInput( qt_xdisplay(), frame, KeyPressMask | KeyReleaseMask | diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 448732963..7cb63acd2 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -1197,7 +1197,7 @@ void ObscuringWindows::create( Client* c ) ObscuringWindows::~ObscuringWindows() { - max_cache_size = QMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1; + max_cache_size = TQMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1; for( TQValueList<Window>::ConstIterator it = obscuring_windows.begin(); it != obscuring_windows.end(); ++it ) @@ -1829,7 +1829,7 @@ void Workspace::slotGrabWindow() } } - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( snapshot ); } else @@ -1842,7 +1842,7 @@ void Workspace::slotGrabWindow() void Workspace::slotGrabDesktop() { TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( p ); } diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h index 27fba34d9..c6fbbc43f 100644 --- a/libkonq/kivdirectoryoverlay.h +++ b/libkonq/kivdirectoryoverlay.h @@ -28,9 +28,10 @@ class KDirLister; class KFileIVI; -class LIBKONQ_EXPORT KIVDirectoryOverlay : public QObject +class LIBKONQ_EXPORT KIVDirectoryOverlay : public TQObject { Q_OBJECT + TQ_OBJECT public: KIVDirectoryOverlay(KFileIVI* directory); virtual ~KIVDirectoryOverlay(); diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index cc05df41d..5e41ef571 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -233,7 +233,7 @@ void KNewMenu::fillMenu() if ( !bSkip ) { - Entry entry = *(s_templatesList->at( i-1 )); + Entry entry = *(s_templatesList->tqat( 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->at( id - 1 )); + Entry entry = *(s_templatesList->tqat( 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 b1ebdc92f..b025f3d4d 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -48,9 +48,9 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_buttonGroup = new TQButtonGroup( i18n("Background"), page ); m_buttonGroup->setColumnLayout( 0, Qt::Vertical ); - m_buttonGroup->layout()->setMargin( KDialog::marginHint() ); - m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() ); - TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() ); + m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() ); + m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); + TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() ); groupLayout->tqsetAlignment( Qt::AlignTop ); mainLayout->addWidget( m_buttonGroup ); @@ -142,7 +142,7 @@ void KonqBgndDialog::initPictures() TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); it++ ) m_comboPicture->comboBox()->insertItem( - ( (*it).at(0) == '/' ) ? // if absolute path + ( (*it).tqat(0) == '/' ) ? // if absolute path KURL( *it ).fileName() : // then only fileName *it ); } diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc index 07a3e8bda..4b97456f6 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.at(0) == '1'); // true if 1 + return (a.tqat(0) == '1'); // true if 1 } } diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 152083895..2c32b5778 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -653,7 +653,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint // event that will be triggered in that case. bool prevUpdatesState = viewport()->isUpdatesEnabled(); - viewport()->setUpdatesEnabled( false ); + viewport()->tqsetUpdatesEnabled( false ); // Do this even if size didn't change, since this is used by refreshMimeTypes... for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { @@ -673,7 +673,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie } // Restore viewport update to previous state - viewport()->setUpdatesEnabled( prevUpdatesState ); + viewport()->tqsetUpdatesEnabled( prevUpdatesState ); if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || !stopImagePreviewFor.isEmpty() ) && autoArrange() ) diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 616404ee5..99afde5dd 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -541,7 +541,7 @@ void KonqOperations::doFileCopy() linkOnly ) { // Neither control nor shift are pressed => show popup menu - KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent()); + KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent()); bool bSetWallpaper = false; if ( iconView && iconView->maySetWallpaper() && lst.count() == 1 ) { @@ -658,8 +658,8 @@ void KonqOperations::setOperation( KIO::Job * job, int method, const KURL::List { connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); - KIO::CopyJob *copyJob = dynamic_cast<KIO::CopyJob*>(job); - KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent()); + KIO::CopyJob *copyJob = tqt_dynamic_cast<KIO::CopyJob*>(job); + KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent()); if (copyJob && iconView) { connect(copyJob, TQT_SIGNAL(aboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)), diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 932b1b7d0..cb42ae481 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.at(0) == '~' ) + if ( url.tqat(0) == '~' ) u.setPath( KShell::tildeExpand( url ) ); - else if ( url.at(0) == '/' ) + else if ( url.tqat(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.at(0) == '/' ) + if ( url.tqat(0) == '/' ) u.setPath( url ); else u = url; diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index e15b52eb0..ba9a23886 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].at(), sn ); + _notifiers[type].insert( _notifiers[type].tqat(), sn ); else _notifiers[type].append( sn ); } |