summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
commitcc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch)
tree2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kate
parent107dd1f98367d07df7cbe2042786511e44706d3a (diff)
downloadtdebase-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
Diffstat (limited to 'kate')
-rw-r--r--kate/app/kateconfigdialog.cpp12
-rw-r--r--kate/app/kateconsole.cpp2
-rw-r--r--kate/app/katedocmanager.cpp10
-rw-r--r--kate/app/katedocmanageriface.cpp8
-rw-r--r--kate/app/kateexternaltools.cpp8
-rw-r--r--kate/app/katefilelist.cpp8
-rw-r--r--kate/app/katemainwindow.cpp6
-rw-r--r--kate/app/katemdi.cpp17
-rw-r--r--kate/app/katemdi.h8
-rw-r--r--kate/app/katesavemodifieddialog.cpp2
-rw-r--r--kate/app/kateviewmanager.cpp18
-rw-r--r--kate/app/kateviewspacecontainer.cpp22
-rw-r--r--kate/app/kwritemain.cpp10
-rw-r--r--kate/app/kwritemain.h2
-rw-r--r--kate/interfaces/plugin.cpp2
-rw-r--r--kate/interfaces/pluginconfiginterface.cpp2
-rw-r--r--kate/interfaces/pluginconfiginterfaceextension.cpp2
-rw-r--r--kate/interfaces/toolviewmanager.cpp6
18 files changed, 77 insertions, 68 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));