From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/app/kateapp.cpp | 10 ++-- kate/app/kateconfigdialog.cpp | 6 +-- kate/app/kateconfigplugindialogpage.cpp | 2 +- kate/app/kateconfigplugindialogpage.h | 2 +- kate/app/kateconsole.cpp | 10 ++-- kate/app/kateconsole.h | 2 +- kate/app/katedocmanager.cpp | 10 ++-- kate/app/katedocmanager.h | 2 +- kate/app/katedocmanageriface.cpp | 8 ++-- kate/app/kateexternaltools.cpp | 28 +++++------ kate/app/katefilelist.cpp | 24 +++++----- kate/app/katefilelist.h | 2 +- kate/app/katefileselector.cpp | 22 ++++----- kate/app/katefileselector.h | 4 +- kate/app/kategrepdialog.cpp | 44 +++++++++--------- kate/app/kategrepdialog.h | 2 +- kate/app/katemailfilesdialog.cpp | 6 +-- kate/app/katemainwindow.cpp | 54 +++++++++++----------- kate/app/katemainwindowiface.cpp | 2 +- kate/app/katemdi.cpp | 18 ++++---- kate/app/katemdi.h | 6 +-- kate/app/katemwmodonhddialog.cpp | 2 +- kate/app/katepluginmanager.h | 2 +- kate/app/katesession.cpp | 2 +- kate/app/katesession.h | 2 +- kate/app/katetabwidget.cpp | 18 ++++---- kate/app/kateviewmanager.cpp | 22 ++++----- kate/app/kateviewmanager.h | 2 +- kate/app/kateviewspace.cpp | 22 ++++----- kate/app/kateviewspace.h | 2 +- kate/app/kateviewspacecontainer.cpp | 50 ++++++++++---------- kate/app/kateviewspacecontainer.h | 2 +- kate/app/kbookmarkhandler.cpp | 2 +- kate/app/kwritemain.cpp | 34 +++++++------- kate/interfaces/application.h | 2 +- kate/interfaces/documentmanager.h | 2 +- kate/interfaces/mainwindow.h | 2 +- kate/interfaces/plugin.cpp | 2 +- kate/interfaces/plugin.h | 2 +- kate/interfaces/pluginconfiginterface.cpp | 2 +- kate/interfaces/pluginconfiginterfaceextension.cpp | 2 +- kate/interfaces/pluginconfiginterfaceextension.h | 2 +- kate/interfaces/pluginmanager.h | 2 +- kate/interfaces/toolviewmanager.cpp | 6 +-- kate/interfaces/toolviewmanager.h | 2 +- kate/interfaces/viewmanager.h | 2 +- kate/utils/dockviewbase.cpp | 2 +- 47 files changed, 228 insertions(+), 228 deletions(-) (limited to 'kate') diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 70c81d465..3518c6308 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -69,19 +69,19 @@ KateApp::KateApp (KCmdLineArgs *args) m_application = new Kate::Application (this); // doc + project man - m_docManager = new KateDocManager (this); + m_docManager = new KateDocManager (TQT_TQOBJECT(this)); // init all normal plugins - m_pluginManager = new KatePluginManager (this); + m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this)); // session manager up - m_sessionManager = new KateSessionManager (this); + m_sessionManager = new KateSessionManager (TQT_TQOBJECT(this)); // application dcop interface m_obj = new KateAppDCOPIface (this); kdDebug()<<"Setting KATE_PID: '"<External Tools menu path.clear(); @@ -269,7 +269,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) page = addVBoxPage( path, i18n("External Tools"), BarIcon("configure", KIcon::SizeSmall) ); configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page"); - connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); + connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) ); // editor widgets from kwrite/kwdialog path.clear(); @@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin) { if ( pluginPages.at(i)->plugin == plugin ) { - TQWidget *w = pluginPages.at(i)->page->parentWidget(); + TQWidget *w = pluginPages.at(i)->page->tqparentWidget(); delete pluginPages.at(i)->page; delete w; pluginPages.remove(pluginPages.at(i)); diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp index 4aa56c78d..7fecffcc5 100644 --- a/kate/app/kateconfigplugindialogpage.cpp +++ b/kate/app/kateconfigplugindialogpage.cpp @@ -33,7 +33,7 @@ #include #include -class KatePluginListItem : public QCheckListItem +class KatePluginListItem : public TQCheckListItem { public: KatePluginListItem(bool checked, KatePluginInfo *info, TQListView *parent); diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h index c02c0411b..afdfc7911 100644 --- a/kate/app/kateconfigplugindialogpage.h +++ b/kate/app/kateconfigplugindialogpage.h @@ -45,7 +45,7 @@ class KatePluginListView : public KListView void stateChanged(KatePluginListItem *, bool); }; -class KateConfigPluginPage: public QVBox +class KateConfigPluginPage: public TQVBox { Q_OBJECT diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index a160162db..8041d5910 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -57,14 +57,14 @@ void KateConsole::loadConsoleIfNeeded() { if (m_part) return; - if (!topLevelWidget() || !parentWidget()) return; - if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return; + if (!tqtopLevelWidget() || !tqparentWidget()) return; + if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return; KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); if (!factory) return; - m_part = static_cast(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart")); + m_part = static_cast(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart")); if (!m_part) return; @@ -86,7 +86,7 @@ void KateConsole::slotDestroyed () m_part = 0; // hide the dockwidget - if (parentWidget()) + if (tqparentWidget()) { m_mw->hideToolView (m_toolView); m_mw->centralWidget()->setFocus (); @@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text ) if (!m_part) return; - TerminalInterface *t = static_cast( m_part->qt_cast( "TerminalInterface" ) ); + TerminalInterface *t = static_cast( m_part->tqqt_cast( "TerminalInterface" ) ); if (!t) return; diff --git a/kate/app/kateconsole.h b/kate/app/kateconsole.h index e308f1df2..dabfda38d 100644 --- a/kate/app/kateconsole.h +++ b/kate/app/kateconsole.h @@ -42,7 +42,7 @@ class KateMainWindow; * This class is used for the internal terminal emulator * It uses internally the konsole part, thx to konsole devs :) */ -class KateConsole : public QVBox +class KateConsole : public TQVBox { Q_OBJECT diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index f60c09783..c06aa7ead 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -86,7 +86,7 @@ KateDocManager::~KateDocManager () { m_metaInfos->setGroup(*it); TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def); - if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos) + if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos) m_metaInfos->deleteGroup(*it); } delete def; @@ -194,7 +194,7 @@ const KateDocumentInfo *KateDocManager::documentInfo (Kate::Document *doc) int KateDocManager::findDocument (Kate::Document *doc) { - return m_docList.find (doc); + return m_docList.tqfind (doc); } uint KateDocManager::documents () @@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL) KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber); } - if ( closeURL && m_tempFiles.contains( documentNumber ) ) + if ( closeURL && m_tempFiles.tqcontains( documentNumber ) ) { TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() ); if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*|| @@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc) m_metaInfos->setGroup(doc->url().prettyURL()); doc->writeSessionConfig(m_metaInfos); m_metaInfos->writeEntry("MD5", (const char *)md5); - m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime()); + m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime()); m_metaInfos->sync(); } } @@ -596,7 +596,7 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result) { KMD5 md5; - if (!md5.update(f)) + if (!md5.update(TQT_TQIODEVICE_OBJECT(f))) return false; md5.hexDigest(result); diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h index b35d0a65f..25b1ba631 100644 --- a/kate/app/katedocmanager.h +++ b/kate/app/katedocmanager.h @@ -54,7 +54,7 @@ class KateDocumentInfo typedef QPair TPair; -class KateDocManager : public QObject +class KateDocManager : public TQObject { Q_OBJECT diff --git a/kate/app/katedocmanageriface.cpp b/kate/app/katedocmanageriface.cpp index 5ef01a1df..64d9d558a 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(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument () if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_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(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqqt_cast("DCOPObject")); if (!obj) return DCOPRef (); diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index 6680e26a4..a7b1f2afd 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -127,7 +127,7 @@ bool KateExternalTool::checkExec() bool KateExternalTool::valid( const TQString &mt ) const { - return mimetypes.isEmpty() || mimetypes.contains( mt ); + return mimetypes.isEmpty() || mimetypes.tqcontains( mt ); } //END KateExternalTool @@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<(wv->topLevelWidget()); + KateMDI::MainWindow *dmw=dynamic_cast(wv->tqtopLevelWidget()); if (!dmw) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<(dmw->action("tools_external")); if (!a) return false; // kdDebug(13001)<<"trying to find action"<actionCollection()->action(actionName.utf8()); + KAction *a1=a->actionCollection()->action(static_cast(actionName.utf8())); if (!a1) return false; // kdDebug(13001)<<"activating action"<activate(); @@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload() bool sepadded = false; for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg ) { - if ( ! tools.contains( *itg ) && - ! removed.contains( *itg ) ) + if ( ! tools.tqcontains( *itg ) && + ! removed.tqcontains( *itg ) ) { if ( ! sepadded ) { @@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged() if ( action ) { l = action->tool->mimetypes; - b = ( ! l.count() || l.contains( mt ) ); + b = ( ! l.count() || l.tqcontains( mt ) ); action->setEnabled( b ); } } @@ -407,7 +407,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged() * This is a TQListBoxItem, that has a KateExternalTool. The text is the Name * of the tool. */ -class ToolItem : public QListBoxPixmap +class ToolItem : public TQListBoxPixmap { public: ToolItem( TQListBox *lb, const TQPixmap &icon, KateExternalTool *tool ) @@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leName = new TQLineEdit( w ); lo->addWidget( leName, 1, 2 ); l = new TQLabel( leName, i18n("&Label:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 1, 1 ); if ( tool ) leName->setText( tool->name ); TQWhatsThis::add( leName, i18n( @@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * teCommand = new TQTextEdit( w ); lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 ); l = new TQLabel( teCommand, i18n("S&cript:"), w ); - l->setAlignment( Qt::AlignTop|Qt::AlignRight ); + l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight ); lo->addWidget( l, 2, 1 ); if ( tool ) teCommand->setText( tool->command ); TQWhatsThis::add( teCommand, i18n( @@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leExecutable = new TQLineEdit( w ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); l = new TQLabel( leExecutable, i18n("&Executable:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 3, 1 ); if ( tool ) leExecutable->setText( tool->tryexec ); TQWhatsThis::add( leExecutable, i18n( @@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leMimetypes = new TQLineEdit( w ); lo->addWidget( leMimetypes, 4, 2 ); l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 4, 1 ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); TQWhatsThis::add( leMimetypes, i18n( @@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * cmbSave = new TQComboBox(w); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); l = new TQLabel( cmbSave, i18n("&Save:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 5, 1 ); TQStringList sl; sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); @@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leCmdLine = new TQLineEdit( w ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); - l->setAlignment( l->alignment()|Qt::AlignRight ); + l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 6, 1 ); if ( tool ) leCmdLine->setText( tool->cmdname ); TQWhatsThis::add( leCmdLine, i18n( @@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew() // This is sticky, it does not change again, so that shortcuts sticks // TODO check for dups - t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" ); + t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" ); new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t ); diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 47c8aa75b..11561e5fd 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -51,7 +51,7 @@ //END Includes //BEGIN ToolTip -class ToolTip : public QToolTip +class ToolTip : public TQToolTip { public: ToolTip( TQWidget *parent, KateFileList *lv ) @@ -69,7 +69,7 @@ class ToolTip : public QToolTip KateFileListItem *item = ((KateFileListItem*)i); if ( ! item ) return; - tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) ); + tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) ); } @@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main, m_editShade = TQColor( 255, 102, 153 ); m_enableBgShading = false; - setFocusPolicy ( TQWidget::NoFocus ); + setFocusPolicy ( TQ_NoFocus ); viewManager = _viewManager; @@ -134,14 +134,14 @@ KateFileList::~KateFileList () void KateFileList::setupActions () { - windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); - windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection()); + windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); + windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection()); sortAction = new KSelectAction( i18n("Sort &By"), 0, m_main->actionCollection(), "filelist_sortby" ); TQStringList l; l << i18n("Opening Order") << i18n("Document Name") << i18n("URL"); sortAction->setItems( l ); - connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) ); + connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) ); } void KateFileList::updateActions () @@ -273,11 +273,11 @@ void KateFileList::slotModChanged (Kate::Document *doc) for ( uint i=0; i < m_editHistory.count(); i++ ) { m_editHistory.at( i )->setEditHistPos( i+1 ); - repaintItem( m_editHistory.at( i ) ); + tqrepaintItem( m_editHistory.at( i ) ); } } else - repaintItem( item ); + tqrepaintItem( item ); } void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char) @@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc) if ( ((KateFileListItem*)item)->document() == doc ) { item->setText( 0, doc->docName() ); - repaintItem( item ); + tqrepaintItem( item ); break; } item = item->nextSibling(); @@ -334,7 +334,7 @@ void KateFileList::slotViewChanged () // int p = 0; // if ( m_viewHistory.count() ) // { -// int p = m_viewHistory.findRef( item ); // only repaint items that needs it +// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it // } m_viewHistory.removeRef( item ); @@ -343,7 +343,7 @@ void KateFileList::slotViewChanged () for ( uint i=0; i < m_viewHistory.count(); i++ ) { m_viewHistory.at( i )->setViewHistPos( i+1 ); - repaintItem( m_viewHistory.at( i ) ); + tqrepaintItem( m_viewHistory.at( i ) ); } } @@ -616,7 +616,7 @@ void KFLConfigPage::apply() m_filelist->m_editShade = kcbEditShade->color(); m_filelist->m_enableBgShading = cbEnableShading->isChecked(); m_filelist->setSortType( cmbSort->currentItem() ); - // repaint the affected items + // tqrepaint the affected items m_filelist->triggerUpdate(); } diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h index e90281558..176898c4d 100644 --- a/kate/app/katefilelist.h +++ b/kate/app/katefilelist.h @@ -38,7 +38,7 @@ class KateMainWindow; class KAction; class KSelectAction; -class KateFileListItem : public QListViewItem +class KateFileListItem : public TQListViewItem { public: KateFileListItem( TQListView *lv, diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 5ab42a289..fb1a3187b 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -67,7 +67,7 @@ //BEGIN Toolbar // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) -static void silenceQToolBar(QtMsgType, const char *){} +static void silenceQToolBar(TQtMsgType, const char *){} // helper classes to be able to have a toolbar without move handle KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent) @@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { - setMinimumHeight(m_tb->sizeHint().height()); + setMinimumHeight(m_tb->tqsizeHint().height()); m_tb->resize(width(),height()); } } @@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, { mActionCollection = new KActionCollection( this ); - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this); toolbar = new KateFileSelectorToolBar(tbp); tbp->setToolBar(toolbar); toolbar->setMovingEnabled(false); toolbar->setFlat(true); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); cmbPath->setAutoDeleteCompletionObject( true ); @@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); @@ -168,7 +168,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, // kaction for the dir sync method acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0, - this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( KToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); @@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u ) newurl.setPath(pathstr); if ( !kateFileSelectorIsReadable ( newurl ) ) - newurl.cd(TQString::fromLatin1("..")); + newurl.cd(TQString::tqfromLatin1("..")); if ( !kateFileSelectorIsReadable (newurl) ) newurl.setPath( TQDir::homeDirPath() ); @@ -486,7 +486,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e ) And the popup is rather useless, if the paths are only partly visible. */ TQListBox *lb = cmbPath->listBox(); - if ( o == lb && e->type() == TQEvent::Show ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; int w = QMIN( mainwin->width(), lb->contentsWidth() + add ); lb->resize( w, lb->height() ); @@ -692,13 +692,13 @@ void KFSConfigPage::init() KAction *ac; TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { - lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); + lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); if ( *it == "bookmarks" || *it == "sync_dir" ) ac = fileSelector->actionCollection()->action( (*it).latin1() ); else ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() ); if ( ac ) - new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it ); + new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it ); } // sync diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h index 442d3101e..285418d64 100644 --- a/kate/app/katefileselector.h +++ b/kate/app/katefileselector.h @@ -56,7 +56,7 @@ public: virtual void setMovingEnabled( bool b ); }; -class KateFileSelectorToolBarParent: public QFrame +class KateFileSelectorToolBarParent: public TQFrame { Q_OBJECT public: @@ -69,7 +69,7 @@ protected: virtual void resizeEvent ( TQResizeEvent * ); }; -class KateFileSelector : public QVBox +class KateFileSelector : public TQVBox { Q_OBJECT diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index 409bfd0a1..7d8cfd951 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -100,8 +100,8 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loInput->setColStretch(1, 20); TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this); - lPattern->setFixedSize(lPattern->sizeHint()); - loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter); + lPattern->setFixedSize(lPattern->tqsizeHint()); + loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loPattern = new TQHBoxLayout( 4 ); loInput->addLayout( loPattern, 0, 1 ); @@ -112,23 +112,23 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion); lPattern->setBuddy(cmbPattern); cmbPattern->setFocus(); - cmbPattern->setMinimumSize(cmbPattern->sizeHint()); + cmbPattern->setMinimumSize(cmbPattern->tqsizeHint()); loPattern->addWidget( cmbPattern ); cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this); - cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width()); + cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width()); cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true)); loPattern->addWidget(cbCasesensitive); cbRegex = new TQCheckBox( i18n("Regular expression"), this ); - cbRegex->setMinimumWidth( cbRegex->sizeHint().width() ); + cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() ); cbRegex->setChecked( config->readBoolEntry( "Regex", true ) ); loPattern->addWidget( cbRegex ); loPattern->setStretchFactor( cmbPattern, 100 ); TQLabel *lTemplate = new TQLabel(i18n("Template:"), this); - lTemplate->setFixedSize(lTemplate->sizeHint()); - loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter); + lTemplate->setFixedSize(lTemplate->tqsizeHint()); + loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loTemplate = new TQHBoxLayout(4); loInput->addLayout(loTemplate, 1, 1); @@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) leTemplate = new KLineEdit(this); lTemplate->setBuddy(leTemplate); leTemplate->setText(strTemplate[0]); - leTemplate->setMinimumSize(leTemplate->sizeHint()); + leTemplate->setMinimumSize(leTemplate->tqsizeHint()); loTemplate->addWidget(leTemplate); KComboBox *cmbTemplate = new KComboBox(false, this); @@ -146,20 +146,20 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loTemplate->addWidget(cmbTemplate); TQLabel *lFiles = new TQLabel(i18n("Files:"), this); - lFiles->setFixedSize(lFiles->sizeHint()); - loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter); + lFiles->setFixedSize(lFiles->tqsizeHint()); + loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter); cmbFiles = new KComboBox(true, this); - lFiles->setBuddy(cmbFiles->focusProxy()); - cmbFiles->setMinimumSize(cmbFiles->sizeHint()); + lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy())); + cmbFiles->setMinimumSize(cmbFiles->tqsizeHint()); cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion); cmbFiles->setDuplicatesEnabled(false); cmbFiles->insertStringList(lastSearchFiles); loInput->addWidget(cmbFiles, 2, 1); TQLabel *lDir = new TQLabel(i18n("Folder:"), this); - lDir->setFixedSize(lDir->sizeHint()); - loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter); + lDir->setFixedSize(lDir->tqsizeHint()); + loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loDir = new TQHBoxLayout(3); loInput->addLayout(loDir, 3, 1); @@ -176,7 +176,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) lDir->setBuddy(cmbDir); cbRecursive = new TQCheckBox(i18n("Recursive"), this); - cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width()); + cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width()); cbRecursive->setChecked(config->readBoolEntry("Recursive", true)); loDir->addWidget(cbRecursive); @@ -286,11 +286,11 @@ void GrepTool::itemSelected(const TQString& item) TQString filename, linenumber; TQString str = item; - if ( (pos = str.find(':')) != -1) + if ( (pos = str.tqfind(':')) != -1) { filename = str.left(pos); str = str.mid(pos+1); - if ( (pos = str.find(':')) != -1) + if ( (pos = str.tqfind(':')) != -1) { filename = m_workingDir + TQDir::separator() + filename; linenumber = str.left(pos); @@ -302,7 +302,7 @@ void GrepTool::itemSelected(const TQString& item) void GrepTool::processOutput() { int pos; - while ( (pos = buf.find('\n')) != -1) + while ( (pos = buf.tqfind('\n')) != -1) { TQString item = buf.mid(2,pos-2); if (!item.isEmpty()) @@ -329,7 +329,7 @@ void GrepTool::slotSearch() return; } - if ( ! leTemplate->text().contains("%s") ) + if ( ! leTemplate->text().tqcontains("%s") ) { leTemplate->setFocus(); return; @@ -347,9 +347,9 @@ void GrepTool::slotSearch() TQString s = cmbPattern->currentText(); if ( ! cbRegex->isChecked() ) - s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); + s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); TQString pattern = leTemplate->text(); - pattern.replace( "%s", s ); + pattern.tqreplace( "%s", s ); childproc = new KProcess(); childproc->setWorkingDirectory( m_workingDir ); @@ -476,7 +476,7 @@ void GrepTool::childExited() if ( ! errbuf.isEmpty() ) { - KMessageBox::information( parentWidget(), i18n("Error:

") + errbuf, i18n("Grep Tool Error") ); + KMessageBox::information( tqparentWidget(), i18n("Error:

") + errbuf, i18n("Grep Tool Error") ); errbuf.truncate(0); } else diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h index e5462a274..525d6b7f1 100644 --- a/kate/app/kategrepdialog.h +++ b/kate/app/kategrepdialog.h @@ -35,7 +35,7 @@ class KConfig; class KURLRequester; class TQEvent; -class GrepTool : public QWidget +class GrepTool : public TQWidget { Q_OBJECT diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 79a1e19c6..52bf1f243 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) } list->hide(); connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); - mw->setMinimumSize( lInfo->sizeHint() ); + mw->setMinimumSize( lInfo->tqsizeHint() ); } TQPtrList KateMailDialog::selectedDocs() @@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton() lInfo->setText( i18n("Press Mail... to send selected documents") ); } - mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) ); - setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) ); + mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) ); + setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) ); resize( width(), minimumHeight() ); } #include "katemailfilesdialog.moc" diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index dea2b0fae..bb6d26f5a 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -87,7 +87,7 @@ uint KateMainWindow::uniqueID = 1; KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) - : KateMDI::MainWindow (0,(TQString("__KateMainWindow#%1").arg(uniqueID)).latin1()) + : KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1()) { // first the very important id myID = uniqueID; @@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) // here we go, set some usable default sizes if (!initialGeometrySet()) { - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); TQSize size; @@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) if (sconfig) { sconfig->setGroup (sgroup); - size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); } // if thats fails, try to reuse size @@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) { // first try global app config KateApp::self()->config()->setGroup ("MainWindow"); - size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); if (size.isEmpty()) size = TQSize (kMin (700, desk.width()), kMin(480, desk.height())); @@ -239,25 +239,25 @@ void KateMainWindow::setupActions() { KAction *a; - KStdAction::openNew( m_viewManager, TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); - KStdAction::open( m_viewManager, TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); + KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); + KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); - fileOpenRecent = KStdAction::openRecent (m_viewManager, TQT_SLOT(openURL (const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection()); fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); a=new KAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" ); a->setWhatsThis(i18n("Save all open, modified documents to disk.")); - KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); + KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); - a=new KAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); + a=new KAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); a->setWhatsThis(i18n("Close all open documents.")); - KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); + KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); - KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); - a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); + a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list).")); if ( KateApp::self()->authorize("shell_access") ) @@ -274,39 +274,39 @@ void KateMainWindow::setupActions() connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu())); connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int))); - a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); + a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); - KAction* settingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); + KAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component.")); // pipe to terminal action if (KateApp::self()->authorize("shell_access")) - new KAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); + new KAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); // tip of the day :-) - KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); if (KatePluginManager::self()->pluginList().count() > 0) { - a=new KAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); + a=new KAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); a->setWhatsThis(i18n("This shows help files for various available plugins.")); } - connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated())); - connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith())); + connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated())); + connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith())); slotWindowActivated (); // session actions - new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, KateSessionManager::self(), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); - new KAction(i18n("&Open..."), "fileopen", 0, KateSessionManager::self(), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); - new KAction(i18n("&Save"), "filesave", 0, KateSessionManager::self(), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); - new KAction(i18n("Save &As..."), "filesaveas", 0, KateSessionManager::self(), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); - new KAction(i18n("&Manage..."), "view_choose", 0, KateSessionManager::self(), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); + new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); + new KAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); + new KAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); + new KAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); + new KAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); // quick open menu ;) new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list"); diff --git a/kate/app/katemainwindowiface.cpp b/kate/app/katemainwindowiface.cpp index c966cb71e..af3c74ed2 100644 --- a/kate/app/katemainwindowiface.cpp +++ b/kate/app/katemainwindowiface.cpp @@ -22,6 +22,6 @@ #include -KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject ((TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w) +KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject (TQString(TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w) { } diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 9d73e762c..9dcb5769d 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw ) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); @@ -176,7 +176,7 @@ void GUIClient::registerToolView (ToolView *tv) KToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text), sc,tv, actionCollection(), aname.latin1() ); - a->setCheckedState(i18n("Hide %1").arg(tv->text)); + a->setCheckedState(TQString(i18n("Hide %1").arg(tv->text))); m_toolViewActions.append(a); m_toolMenu->insert(a); @@ -256,8 +256,8 @@ bool ToolView::visible () const void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && ev->child()->qt_cast("TQWidget")) - setFocusProxy ((TQWidget *)(ev->child()->qt_cast("TQWidget"))); + if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget")) + setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget"))); TQVBox::childEvent (ev); } @@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi bool Sidebar::removeWidget (ToolView *widget) { - if (!m_widgetToId.contains(widget)) + if (!m_widgetToId.tqcontains(widget)) return false; removeTab(m_widgetToId[widget]); @@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget) bool Sidebar::showWidget (ToolView *widget) { - if (!m_widgetToId.contains(widget)) + if (!m_widgetToId.tqcontains(widget)) return false; // hide other non-persistent views @@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget) bool Sidebar::hideWidget (ToolView *widget) { - if (!m_widgetToId.contains(widget)) + if (!m_widgetToId.tqcontains(widget)) return false; bool anyVis = false; @@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config) //BEGIN MAIN WINDOW -MainWindow::MainWindow (TQWidget* parentWidget, const char* name) - : KParts::MainWindow( parentWidget, name) +MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name) + : KParts::MainWindow( tqparentWidget, name) , m_sidebarsVisible(true) , m_restoreConfig (0) , m_guiClient (new GUIClient (this)) diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 1b13c30a8..a4baf6b16 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -38,7 +38,7 @@ namespace KateMDI { /** This class is needed because TQSplitter cant return an index for a widget. */ -class Splitter : public QSplitter +class Splitter : public TQSplitter { Q_OBJECT @@ -99,7 +99,7 @@ class GUIClient : public TQObject, public KXMLGUIClient KActionMenu *m_toolMenu; }; -class ToolView : public QVBox +class ToolView : public TQVBox { Q_OBJECT @@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow /** * Constructor */ - MainWindow (TQWidget* parentWidget = 0, const char* name = 0); + MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0); /** * Destructor diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index 5199a6925..42d2089c3 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -40,7 +40,7 @@ #include #include -class KateDocItem : public QCheckListItem +class KateDocItem : public TQCheckListItem { public: KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv ) diff --git a/kate/app/katepluginmanager.h b/kate/app/katepluginmanager.h index 568b3bbd1..1617c5501 100644 --- a/kate/app/katepluginmanager.h +++ b/kate/app/katepluginmanager.h @@ -41,7 +41,7 @@ class KatePluginInfo typedef TQValueList KatePluginList; -class KatePluginManager : public QObject +class KatePluginManager : public TQObject { Q_OBJECT diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index fd0e059f9..a62924b92 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -596,7 +596,7 @@ void KateSessionManager::sessionManage () //BEGIN CHOOSER DIALOG -class KateSessionChooserItem : public QListViewItem +class KateSessionChooserItem : public TQListViewItem { public: KateSessionChooserItem (KListView *lv, KateSession::Ptr s) diff --git a/kate/app/katesession.h b/kate/app/katesession.h index a670bb006..412207b28 100644 --- a/kate/app/katesession.h +++ b/kate/app/katesession.h @@ -160,7 +160,7 @@ class KateSession : public KShared typedef TQValueList KateSessionList; -class KateSessionManager : public QObject +class KateSessionManager : public TQObject { Q_OBJECT diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp index 4b278e327..13a099730 100644 --- a/kate/app/katetabwidget.cpp +++ b/kate/app/katetabwidget.cpp @@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void KateTabWidget::removePage ( TQWidget * w ) @@ -132,18 +132,18 @@ void KateTabWidget::setCornerWidgetVisibility(bool visible) { // there are two corner widgets: on TopLeft and on TopTight! - if (cornerWidget(Qt::TopLeft) ) { + if (cornerWidget(TQt::TopLeft) ) { if (visible) - cornerWidget(Qt::TopLeft)->show(); + cornerWidget(TQt::TopLeft)->show(); else - cornerWidget(Qt::TopLeft)->hide(); + cornerWidget(TQt::TopLeft)->hide(); } - if (cornerWidget(Qt::TopRight) ) { + if (cornerWidget(TQt::TopRight) ) { if (visible) - cornerWidget(Qt::TopRight)->show(); + cornerWidget(TQt::TopRight)->show(); else - cornerWidget(Qt::TopRight)->hide(); + cornerWidget(TQt::TopRight)->hide(); } } diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index c62e6e082..0789f0502 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -94,47 +94,47 @@ void KateViewManager::setupActions () /** * tabbing */ - a=new KAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()), + a=new KAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()), m_mainWindow->actionCollection(), "view_new_tab" ); - m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()), + m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()), m_mainWindow->actionCollection(),"view_close_tab"); m_activateNextTab = new KAction( i18n( "Activate Next Tab" ), TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), - this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); + TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); m_activatePrevTab = new KAction( i18n( "Activate Previous Tab" ), TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(), - this, TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); + TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); /** * view splitting */ - a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( + a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert"); a->setWhatsThis(i18n("Split the currently active view vertically into two views.")); - a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( + a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz"); a->setWhatsThis(i18n("Split the currently active view horizontally into two views.")); - m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this, + m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(), "view_close_current_space" ); m_closeView->setWhatsThis(i18n("Close the currently active splitted view")); - goNext=new KAction(i18n("Next View"),Key_F8,this, + goNext=new KAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this), TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next"); goNext->setWhatsThis(i18n("Make the next split view the active one.")); - goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); + goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); goPrev->setWhatsThis(i18n("Make the previous split view the active one.")); @@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions () } void KateViewManager::tabChanged(TQWidget* widget) { - KateViewSpaceContainer *container=static_cast(widget->qt_cast("KateViewSpaceContainer")); + KateViewSpaceContainer *container=static_cast(widget->tqqt_cast("KateViewSpaceContainer")); Q_ASSERT(container); m_currentContainer=container; @@ -215,7 +215,7 @@ void KateViewManager::slotCloseTab() if (m_viewSpaceContainerList.count() <= 1) return; if (!m_currentContainer) return; - int pos = m_viewSpaceContainerList.find (m_currentContainer); + int pos = m_viewSpaceContainerList.tqfind (m_currentContainer); if (pos == -1) return; diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h index ddc796a4c..6bf1b5f77 100644 --- a/kate/app/kateviewmanager.h +++ b/kate/app/kateviewmanager.h @@ -36,7 +36,7 @@ class KAction; class TQToolButton; -class KateViewManager : public QObject +class KateViewManager : public TQObject { Q_OBJECT diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 43a73a2b6..bdb4e22e4 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -67,9 +67,9 @@ protected: void paintEvent( TQPaintEvent *e ) { TQPainter p( this ); - p.setPen( colorGroup().shadow() ); + p.setPen( tqcolorGroup().shadow() ); p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); - p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() ); + p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() ); p.drawLine( e->rect().left(), 1, e->rect().right(), 1 ); } }; @@ -228,7 +228,7 @@ bool KateViewSpace::event( TQEvent *e ) void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg) { - if ((TQWidgetStack *)view->parentWidget() != stack) + if ((TQWidgetStack *)view->tqparentWidget() != stack) return; mStatusBar->setStatus( r, c, ovr, block, mod, msg ); } @@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name ) { m_lineColLabel = new TQLabel( this ); addWidget( m_lineColLabel, 0, false ); - m_lineColLabel->setAlignment( Qt::AlignCenter ); + m_lineColLabel->tqsetAlignment( Qt::AlignCenter ); m_lineColLabel->installEventFilter( this ); m_modifiedLabel = new TQLabel( TQString(" "), this ); addWidget( m_modifiedLabel, 0, false ); - m_modifiedLabel->setAlignment( Qt::AlignCenter ); + m_modifiedLabel->tqsetAlignment( Qt::AlignCenter ); m_modifiedLabel->installEventFilter( this ); m_insertModeLabel = new TQLabel( i18n(" INS "), this ); addWidget( m_insertModeLabel, 0, false ); - m_insertModeLabel->setAlignment( Qt::AlignCenter ); + m_insertModeLabel->tqsetAlignment( Qt::AlignCenter ); m_insertModeLabel->installEventFilter( this ); m_selectModeLabel = new TQLabel( i18n(" NORM "), this ); addWidget( m_selectModeLabel, 0, false ); - m_selectModeLabel->setAlignment( Qt::AlignCenter ); + m_selectModeLabel->tqsetAlignment( Qt::AlignCenter ); m_selectModeLabel->installEventFilter( this ); m_fileNameLabel=new KSqueezedTextLabel( this ); addWidget( m_fileNameLabel, 1, true ); m_fileNameLabel->setMinimumSize( 0, 0 ); - m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); - m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); + m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); m_fileNameLabel->installEventFilter( this ); installEventFilter( this ); @@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged() void KateVSStatusBar::showMenu() { - KMainWindow* mainWindow = static_cast( topLevelWidget() ); + KMainWindow* mainWindow = static_cast( tqtopLevelWidget() ); TQPopupMenu* menu = static_cast( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); if (menu) @@ -410,7 +410,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e) if ( m_viewSpace->currentView() ) m_viewSpace->currentView()->setFocus(); - if ( ((TQMouseEvent*)e)->button()==RightButton) + if ( ((TQMouseEvent*)e)->button()==Qt::RightButton) showMenu(); return true; diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h index b6a5a185e..2c82332d3 100644 --- a/kate/app/kateviewspace.h +++ b/kate/app/kateviewspace.h @@ -68,7 +68,7 @@ class KateVSStatusBar : public KStatusBar class KateViewSpace *m_viewSpace; }; -class KateViewSpace : public QVBox +class KateViewSpace : public TQVBox { friend class KateViewSpaceContainer; friend class KateVSStatusBar; diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 1e05e8b5a..98513a222 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace) { if (!view) return true; - KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget(); + KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget(); viewspace->removeView (view); @@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v) { if (!v) return; - KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget(); + KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget(); if (!vs->isActiveSpace()) { setActiveSpace (vs); @@ -275,7 +275,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view ) } setActiveView (view); - m_viewList.findRef (view); + m_viewList.tqfindRef (view); mainWindow()->toolBar ()->setUpdatesEnabled (false); @@ -337,7 +337,7 @@ void KateViewSpaceContainer::slotViewChanged() void KateViewSpaceContainer::activateNextView() { - uint i = m_viewSpaceList.find (activeViewSpace())+1; + uint i = m_viewSpaceList.tqfind (activeViewSpace())+1; if (i >= m_viewSpaceList.count()) i=0; @@ -348,7 +348,7 @@ void KateViewSpaceContainer::activateNextView() void KateViewSpaceContainer::activatePrevView() { - int i = m_viewSpaceList.find (activeViewSpace())-1; + int i = m_viewSpaceList.tqfind (activeViewSpace())-1; if (i < 0) i=m_viewSpaceList.count()-1; @@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, if (!activeView()) return; if (!vs) vs = activeViewSpace(); - bool isFirstTime = vs->parentWidget() == this; + bool isFirstTime = vs->tqparentWidget() == this; TQValueList psizes; if ( ! isFirstTime ) - if ( TQSplitter *ps = static_cast(vs->parentWidget()->qt_cast("TQSplitter")) ) + if ( TQSplitter *ps = static_cast(vs->tqparentWidget()->tqqt_cast("TQSplitter")) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; - KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget()); + KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget()); s->setOpaqueResize( KGlobalSettings::opaqueResize() ); if (! isFirstTime) { // anders: make sure the split' viewspace is always // correctly positioned. // If viewSpace is the first child, the new splitter must be moveToFirst'd - if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) ) - ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s ); + if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) ) + ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s ); } vs->reparent( s, 0, TQPoint(), true ); KateViewSpace* vsNew = new KateViewSpace( this, s ); @@ -471,13 +471,13 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, s->moveToFirst( vsNew ); if (!isFirstTime) - if (TQSplitter *ps = static_cast(s->parentWidget()->qt_cast("TQSplitter")) ) + if (TQSplitter *ps = static_cast(s->tqparentWidget()->tqqt_cast("TQSplitter")) ) ps->setSizes( psizes ); s->show(); TQValueList sizes; - int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2; + int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2; sizes << space << space; s->setSizes( sizes ); @@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // abort if this is the last viewspace if (m_viewSpaceList.count() < 2) return; - KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget(); + KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget(); // find out if it is the first child for repositioning // see below @@ -512,16 +512,16 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // save some size information KateMDI::Splitter* pp=0L; TQValueList ppsizes; - if (m_viewSpaceList.count() > 2 && p->parentWidget() != this) + if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this) { - pp = (KateMDI::Splitter*)p->parentWidget(); + pp = (KateMDI::Splitter*)p->tqparentWidget(); ppsizes = pp->sizes(); pIsFirst = !pp->isLastChild( p ); // simple logic, right- } // Figure out where to put views that are still needed KateViewSpace* next; - if (m_viewSpaceList.find(viewspace) == 0) + if (m_viewSpaceList.tqfind(viewspace) == 0) next = m_viewSpaceList.next(); else next = m_viewSpaceList.prev(); @@ -550,14 +550,14 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) m_viewSpaceList.remove( viewspace ); // reparent the other sibling of the parent. - while (p->children ()) + while (!p->childrenListObject().isEmpty()) { - TQWidget* other = ((TQWidget *)(( TQPtrList*)p->children())->first()); + TQWidget* other = ((TQWidget *)(( TQPtrList)p->childrenListObject()).first()); - other->reparent( p->parentWidget(), 0, TQPoint(), true ); + other->reparent( p->tqparentWidget(), 0, TQPoint(), true ); // We also need to find the right viewspace to become active if (pIsFirst) - ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other ); + ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other ); if ( other->isA("KateViewSpace") ) { setActiveSpace( (KateViewSpace*)other ); } @@ -676,20 +676,20 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, TQStringList childList; // a katesplitter has two children, of which one may be a KateSplitter. - const TQObjectList* l = s->children(); - TQObjectListIt it( *l ); + const TQObjectList l = s->childrenListObject(); + TQObjectListIt it( l ); TQObject* obj; for (; it.current(); ++it) { obj = it.current(); TQString n; // name for child list, see below // For KateViewSpaces, ask them to save the file list. if ( obj->isA("KateViewSpace") ) { - n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) ); - ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.find((KateViewSpace*)obj), viewConfGrp); + n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.tqfind((KateViewSpace*)obj) ); + ((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.tqfind((KateViewSpace*)obj), viewConfGrp); // save active viewspace if ( ((KateViewSpace*)obj)->isActiveSpace() ) { config->setGroup(viewConfGrp); - config->writeEntry("Active Viewspace", m_viewSpaceList.find((KateViewSpace*)obj) ); + config->writeEntry("Active Viewspace", m_viewSpaceList.tqfind((KateViewSpace*)obj) ); } } // For KateSplitters, recurse diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h index 402b368d1..0c6b33246 100644 --- a/kate/app/kateviewspacecontainer.h +++ b/kate/app/kateviewspacecontainer.h @@ -32,7 +32,7 @@ class KConfig; class KateMainWindow; -class KateViewSpaceContainer: public QVBox +class KateViewSpaceContainer: public TQVBox { Q_OBJECT diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp index 8ef055e36..bdb85130b 100644 --- a/kate/app/kbookmarkhandler.cpp +++ b/kate/app/kbookmarkhandler.cpp @@ -73,7 +73,7 @@ void KBookmarkHandler::slotNewBookmark( const TQString& /*text*/, { *m_importStream << "\n"; - *m_importStream << "" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "\n\n"; + *m_importStream << "" << (additionalInfo.isEmpty() ? TQString(TQString::fromUtf8(url)) : additionalInfo) << "\n\n"; } void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/, diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index efb71b767..5494b4149 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -107,12 +107,12 @@ KWrite::KWrite (KTextEditor::Document *doc) guiFactory()->addClient( m_view ); // install a working kate part popup dialog thingy - if (static_cast(m_view->qt_cast("Kate::View"))) - static_cast(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + if (static_cast(m_view->tqqt_cast("Kate::View"))) + static_cast(m_view->tqqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) - resize( TQSize(700, 480).expandedTo(minimumSizeHint())); + resize( TQSize(700, 480).expandedTo(tqminimumSizeHint())); // call it as last thing, must be sure everything is already set up ;) setAutoSaveSettings (); @@ -139,41 +139,41 @@ KWrite::~KWrite() void KWrite::setupActions() { - KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); + KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); // setup File menu - KStdAction::print(this, TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); - KStdAction::openNew( this, TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); - KStdAction::open( this, TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); + KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); - m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpen(const KURL&)), + m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)), actionCollection()); m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - KAction *a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newView()), + KAction *a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create another view containing the current document")); - a=new KAction(i18n("Choose Editor..."),0,this,TQT_SLOT(changeEditor()), + a=new KAction(i18n("Choose Editor..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()), actionCollection(),"settings_choose_editor"); a->setWhatsThis(i18n("Override the system wide setting for the default editing component")); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); // setup Settings menu setStandardToolBarMenuEnabled(true); - m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); + m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar")); - m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()), + m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()), actionCollection(), "set_showPath"); m_paShowPath->setCheckedState(i18n("Hide Path")); m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption")); - a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection()); + a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); } @@ -458,7 +458,7 @@ void KWrite::readProperties(KConfig *config) void KWrite::saveProperties(KConfig *config) { writeConfig(config); - config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1); + config->writeEntry("DocumentNumber",docList.tqfind(m_view->document()) + 1); if (KTextEditor::sessionConfigInterface(m_view)) KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config); @@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents TQString buf = TQString("Window %1").arg(z); config->setGroup(buf); - config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1); + config->writeEntry("DocumentNumber",docList.tqfind(winList.at(z-1)->view()->document()) + 1); } } diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h index be9cd23c6..52eb129d5 100644 --- a/kate/interfaces/application.h +++ b/kate/interfaces/application.h @@ -35,7 +35,7 @@ class MainWindow; * other objects like document/projectmanager, ... no way goes around this * central interface */ -class KDE_EXPORT Application : public QObject +class KDE_EXPORT Application : public TQObject { friend class PrivateApplication; diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h index a0c5e2387..8b5f554af 100644 --- a/kate/interfaces/documentmanager.h +++ b/kate/interfaces/documentmanager.h @@ -26,7 +26,7 @@ namespace Kate { /** This interface provides access to the Kate Document Manager. */ -class KDE_EXPORT DocumentManager : public QObject +class KDE_EXPORT DocumentManager : public TQObject { friend class PrivateDocumentManager; diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h index 5c8449b62..bb40ffb9c 100644 --- a/kate/interfaces/mainwindow.h +++ b/kate/interfaces/mainwindow.h @@ -29,7 +29,7 @@ namespace Kate class ViewManager; -class KDE_EXPORT MainWindow : public QObject +class KDE_EXPORT MainWindow : public TQObject { friend class PrivateMainWindow; diff --git a/kate/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index 849b12a1e..45c0b8f35 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(plugin->qt_cast("Kate::PluginViewInterface")); + return static_cast(plugin->tqqt_cast("Kate::PluginViewInterface")); } } diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h index 53ee16bd6..42803db7c 100644 --- a/kate/interfaces/plugin.h +++ b/kate/interfaces/plugin.h @@ -32,7 +32,7 @@ namespace Kate class Application; class MainWindow; -class KDE_EXPORT Plugin : public QObject +class KDE_EXPORT Plugin : public TQObject { friend class PrivatePlugin; diff --git a/kate/interfaces/pluginconfiginterface.cpp b/kate/interfaces/pluginconfiginterface.cpp index 594b73e5d..66afe4d7c 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(plugin->qt_cast("Kate::PluginConfigInterface")); + return static_cast(plugin->tqqt_cast("Kate::PluginConfigInterface")); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.cpp b/kate/interfaces/pluginconfiginterfaceextension.cpp index 53c22122b..d09996b8e 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(plugin->qt_cast("Kate::PluginConfigInterfaceExtension")); + return static_cast(plugin->tqqt_cast("Kate::PluginConfigInterfaceExtension")); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h index 17a74ce7d..2e66f9d79 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.h +++ b/kate/interfaces/pluginconfiginterfaceextension.h @@ -26,7 +26,7 @@ namespace Kate { -class KDE_EXPORT PluginConfigPage : public QWidget +class KDE_EXPORT PluginConfigPage : public TQWidget { Q_OBJECT diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h index d9473e584..0aeb7785e 100644 --- a/kate/interfaces/pluginmanager.h +++ b/kate/interfaces/pluginmanager.h @@ -27,7 +27,7 @@ namespace Kate { /** This interface provides access to the Kate Plugin Manager. */ -class KDE_EXPORT PluginManager : public QObject +class KDE_EXPORT PluginManager : public TQObject { friend class PrivatePluginManager; diff --git a/kate/interfaces/toolviewmanager.cpp b/kate/interfaces/toolviewmanager.cpp index 848ec5fa2..3d8b0a9db 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->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->moveToolView (static_cast(widget), (KMultiTabBar::KMultiTabBarPosition)pos); @@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position bool ToolViewManager::showToolView(TQWidget *widget) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->showToolView (static_cast(widget)); @@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget) bool ToolViewManager::hideToolView(TQWidget *widget) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->hideToolView (static_cast(widget)); diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h index 2e9242f3a..88a669476 100644 --- a/kate/interfaces/toolviewmanager.h +++ b/kate/interfaces/toolviewmanager.h @@ -29,7 +29,7 @@ namespace Kate /** Interface to the toolviewmanager */ -class KDE_EXPORT ToolViewManager : public QObject +class KDE_EXPORT ToolViewManager : public TQObject { friend class PrivateToolViewManager; diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h index 9bdc938d7..15eb61312 100644 --- a/kate/interfaces/viewmanager.h +++ b/kate/interfaces/viewmanager.h @@ -30,7 +30,7 @@ class View; /** * Interface to the viewmanager */ -class KDE_EXPORT ViewManager : public QObject +class KDE_EXPORT ViewManager : public TQObject { friend class PrivateViewManager; diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp index 76e5844ed..6048f9b70 100644 --- a/kate/utils/dockviewbase.cpp +++ b/kate/utils/dockviewbase.cpp @@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title ) { setSpacing( 4 ); d->header = new TQWidget( this ); - d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); + d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); TQHBoxLayout *lo = new TQHBoxLayout( d->header ); lo->setSpacing( 6 ); lo->insertSpacing( 0, 6 ); -- cgit v1.2.3