TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Allow kdebase to (mostly) function correctly with TQt for Qt4

Browse Source 
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
v3.5.13-sru
tpearson 12 years ago
parent 107dd1f983
commit cc0ad49c75
179 changed files with 851 additions and 812 deletions
Show Stats Download Patch File Download Diff File

12
kate/app/kateconfigdialog.cpp
Unescape View File

@ -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();

2
kate/app/kateconsole.cpp
Unescape View File

@ -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;

10
kate/app/katedocmanager.cpp
Unescape View File

@ -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;

8
kate/app/katedocmanageriface.cpp
Unescape View File

@ -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 ();

8
kate/app/kateexternaltools.cpp
Unescape View File

@ -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;

8
kate/app/katefilelist.cpp
Unescape View File

@ -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 ) );
}
}

6
kate/app/katemainwindow.cpp
Unescape View File

@ -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;
}
}

17
kate/app/katemdi.cpp
Unescape View File

@ -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();

8
kate/app/katemdi.h
Unescape View File

@ -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;

2
kate/app/katesavemodifieddialog.cpp
Unescape View File

@ -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;

18
kate/app/kateviewmanager.cpp
Unescape View File

@ -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())

22
kate/app/kateviewspacecontainer.cpp
Unescape View File

@ -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() );
*/

10
kate/app/kwritemain.cpp
Unescape View File

@ -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);
}
}

2
kate/app/kwritemain.h
Unescape View File

@ -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);

2
kate/interfaces/plugin.cpp
Unescape View File

@ -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"));
}
}

2
kate/interfaces/pluginconfiginterface.cpp
Unescape View File

@ -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"));
}

2
kate/interfaces/pluginconfiginterfaceextension.cpp
Unescape View File

@ -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"));
}

6
kate/interfaces/toolviewmanager.cpp
Unescape View File

@ -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));

6
kcontrol/arts/arts.cpp
Unescape View File

@ -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)
{

6
kcontrol/background/bgsettings.cpp
Unescape View File

@ -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();

2
kcontrol/bell/bell.cpp
Unescape View File

@ -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);

10
kcontrol/colors/colorscm.cpp
Unescape View File

@ -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);
}

16
kcontrol/componentchooser/componentchooser.cpp
Unescape View File

@ -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);
}

4
kcontrol/fonts/fonts.cpp
Unescape View File

@ -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);
}
}

6
kcontrol/iccconfig/iccconfig.cpp
Unescape View File

@ -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"
#include "iccconfig.moc"

2
kcontrol/input/Makefile.am
Unescape View File

@ -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

4
kcontrol/input/xcursor/previewwidget.cpp
Unescape View File

@ -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 );
}

7
kcontrol/kcontrol/proxywidget.cpp
Unescape View File

@ -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

2
kcontrol/kdm/kdm-appear.cpp
Unescape View File

@ -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);

12
kcontrol/keys/keyconfig.cpp
Unescape View File

@ -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 );

4
kcontrol/konq/desktopbehavior_impl.cpp
Unescape View File

@ -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);
}
}

2
kcontrol/konqhtml/domainlistview.cpp
Unescape View File

@ -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());

2
kcontrol/konqhtml/jspolicies.cpp
Unescape View File

@ -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);

4
kcontrol/konsole/sessioneditor.cpp
Unescape View File

@ -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;

12
kcontrol/launch/kcmlaunch.cpp
Unescape View File

@ -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 );

14
kcontrol/locale/kcmlocale.cpp
Unescape View File