diff options
Diffstat (limited to 'parts/documentation')
48 files changed, 171 insertions, 201 deletions
diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h index c55143e7..733bc7bf 100644 --- a/parts/documentation/KDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -26,7 +26,7 @@ class DocumentationPart; class KDevDocumentationIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index b074ecb6..4353e1b8 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -28,10 +28,10 @@ class DocumentationPlugin; class AddCatalogDlg: public AddCatalogDlgBase { - Q_OBJECT + TQ_OBJECT public: - AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); ~AddCatalogDlg(); TQString title() const; diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index b524720f..2734918d 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -135,9 +135,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -152,9 +149,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -195,10 +189,10 @@ <slot>locationURLChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> <slot>docTypeChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index f626e246..8ac25005 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -24,7 +24,7 @@ #include <tqpoint.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdialog.h> #include <kpushbutton.h> @@ -133,16 +133,16 @@ BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) showBookmarks(); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_addButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(addBookmark())); - connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editBookmark())); - connect(m_removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBookmark())); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_addButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(addBookmark())); + connect(m_editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editBookmark())); + connect(m_removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeBookmark())); - connect(m_widget->part(), TQT_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), - this, TQT_SLOT(addBookmark(const TQString&, const KURL& ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_widget->part(), TQ_SIGNAL(bookmarkLocation(const TQString&, const KURL& )), + this, TQ_SLOT(addBookmark(const TQString&, const KURL& ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } BookmarkView::~BookmarkView() @@ -268,7 +268,7 @@ void BookmarkView::addBookmark(const TQString &title, const KURL &url) void BookmarkView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index 36283e0c..cdd102a0 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -49,7 +49,7 @@ private: class BookmarkView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BookmarkView(DocumentationWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 3707f318..d77126b1 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -47,10 +47,10 @@ ContentsView::ContentsView(DocumentationWidget *parent, const char *name) m_view->setSorting(-1); m_view->setAllColumnsShowFocus( true ); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemExecuted(TQListViewItem*, const TQPoint&, int ))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } ContentsView::~ContentsView() @@ -73,7 +73,7 @@ void ContentsView::itemExecuted(TQListViewItem *item, const TQPoint &/*p*/, int void ContentsView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index e170b7dc..a638a5c9 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -29,7 +29,7 @@ class TDEListView; class ContentsView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ContentsView(DocumentationWidget *parent, const char *name = 0); diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index 55b108ec..47b0c0f0 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -40,10 +40,10 @@ DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) setResizeMode( TQListView::LastColumn ); setSorting(3); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemClicked(TQListViewItem*, const TQPoint&, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(itemDoubleClicked(TQListViewItem*, const TQPoint&, int ))); } DocConfigListView::~DocConfigListView() diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index 811c49b1..13db2301 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -24,7 +24,7 @@ class DocConfigListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocConfigListView(TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 8dd6c0b8..22b57fec 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kurlrequester.h> #include <tdefontcombo.h> @@ -64,19 +64,19 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, { (*it)->loadCatalogConfiguration( m_View ); } - connect( m_View, TQT_SIGNAL(itemActivated()), this, TQT_SLOT(editCollectionButtonClicked()) ); + connect( m_View, TQ_SIGNAL(itemActivated()), this, TQ_SLOT(editCollectionButtonClicked()) ); TDEConfig *config = m_part->config(); //read full text search settings config->setGroup("htdig"); - TQString databaseDir = kapp->dirs()->saveLocation("data", + TQString databaseDir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir)); - htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"))); - htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"))); - htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch"))); - if (config->readBoolEntry("IsSetup", false) == false) + htdigbinEdit->setURL(config->readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig"))); + htmergebinEdit->setURL(config->readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge"))); + htsearchbinEdit->setURL(config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch"))); + if (!config->readBoolEntry("IsSetup", false)) { TQFileInfo fi(htsearchbinEdit->url()); if (!fi.exists()) @@ -104,7 +104,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index 8fee856c..48d33817 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -31,7 +31,7 @@ class TDEListView; class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 5d2d4038..2befa99f 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -557,7 +557,7 @@ <tabstop>info_box</tabstop> <tabstop>man_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addCollectionButtonClicked()</slot> <slot>editCollectionButtonClicked()</slot> <slot>removeCollectionButtonClicked()</slot> @@ -565,7 +565,7 @@ <slot>collectionsBoxCurrentChanged( int )</slot> <slot>updateConfig()</slot> <slot>updateIndex()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index 0b7b4452..a35a0795 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -26,7 +26,7 @@ class DocumentationPart; class DocumentationPlugin; class DocProjectConfigWidget: public DocProjectConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index 8914aaa1..a882bc77 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -140,9 +140,9 @@ <tabstop>catalogURL</tabstop> <tabstop>docSystemCombo</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>changeDocSystem(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 3b9e9b78..0bac7045 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -72,13 +72,13 @@ #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -static const KDevPluginInfo data("kdevdocumentation"); +static const KDevPluginInfo pluginData("kdevdocumentation"); typedef KDevGenericFactory<DocumentationPart> DocumentationFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) ) DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), + :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); @@ -87,11 +87,11 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() ); m_configProxy->createProjectConfigPage(i18n("Project Documentation"), PROJECTDOC_OPTIONS, info()->icon() ); - connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); - connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened())); - connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed())); + connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int))); + connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); m_widget = new DocumentationWidget(this); m_widget->setIcon(SmallIcon(info()->icon())); @@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T setupActions(); checkLastVersion(); - TQTimer::singleShot(5, this, TQT_SLOT(init())); + TQTimer::singleShot(5, this, TQ_SLOT(init())); new KDevDocumentationIface(this); } @@ -147,7 +147,7 @@ void DocumentationPart::loadDocumentationPlugins() { kdDebug() << " success" << endl; docPlugin->init(m_widget->contents()); - connect(this, TQT_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQT_SLOT(createIndex(IndexBox* ))); + connect(this, TQ_SIGNAL(indexSelected(IndexBox* )), docPlugin, TQ_SLOT(createIndex(IndexBox* ))); m_plugins.append(docPlugin); } } @@ -172,13 +172,13 @@ void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *pag case GLOBALDOC_OPTIONS: { DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, page, "doc config widget"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } case PROJECTDOC_OPTIONS: { DocProjectConfigWidget *w1 = new DocProjectConfigWidget(this, page, "doc project config"); - connect(dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); break; } } @@ -199,7 +199,7 @@ bool DocumentationPart::configure(int page) DocGlobalConfigWidget *w1 = new DocGlobalConfigWidget(this, m_widget, dlg.plainPage()); l->addWidget(w1); w1->docTab->setCurrentPage(page); - connect(&dlg, TQT_SIGNAL(okClicked()), w1, TQT_SLOT(accept())); + connect(&dlg, TQ_SIGNAL(okClicked()), w1, TQ_SLOT(accept())); return (dlg.exec() == TQDialog::Accepted); } @@ -211,7 +211,7 @@ void DocumentationPart::setupActions() TDEAction *action; action = new TDEAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, - this, TQT_SLOT(searchInDocumentation()), + this, TQ_SLOT(searchInDocumentation()), actionCollection(), "help_search_in_doc" ); action->setToolTip(i18n("Full text search in the documentation")); action->setWhatsThis(i18n("<b>Search in documentation</b><p>" @@ -222,7 +222,7 @@ void DocumentationPart::setupActions() "configuration dialog of the documentation plugin.")); action = new TDEAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, - this, TQT_SLOT(lookInDocumentationIndex()), + this, TQ_SLOT(lookInDocumentationIndex()), actionCollection(), "help_look_in_index" ); action->setToolTip(i18n("Look in the documentation index")); action->setWhatsThis(i18n("<b>Look in documentation index</b><p>" @@ -231,19 +231,19 @@ void DocumentationPart::setupActions() "the documentation index.")); action = new TDEAction(i18n("Man Page..."), 0, - this, TQT_SLOT(manPage()), + this, TQ_SLOT(manPage()), actionCollection(), "help_manpage" ); action->setToolTip(i18n("Show a manpage")); action->setWhatsThis(i18n("<b>Show a manpage</b><p>Opens a man page using embedded viewer.")); action = new TDEAction(i18n("Info Page..."), 0, - this, TQT_SLOT(infoPage()), + this, TQ_SLOT(infoPage()), actionCollection(), "help_infopage"); action->setToolTip(i18n("Show an infopage")); action->setWhatsThis(i18n("<b>Show an infopage</b><p>Opens an info page using embedded viewer.")); action = new TDEAction(i18n("Find Documentation..."), 0, - this, TQT_SLOT(findInDocumentation()), + this, TQ_SLOT(findInDocumentation()), actionCollection(), "help_find_documentation"); action->setToolTip(i18n("Find Documentation")); action->setWhatsThis(i18n("<b>Find documentation</b><p>" @@ -467,7 +467,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) int id = -1; if (hasContextFeature(Finder)) { id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextFindDocumentation())); + this, TQ_SLOT(contextFindDocumentation())); popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>" "Opens the documentation finder tab and searches " "all possible sources of documentation like " @@ -476,7 +476,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(IndexLookup)) { id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), - this, TQT_SLOT(contextLookInDocumentationIndex())); + this, TQ_SLOT(contextLookInDocumentationIndex())); popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " @@ -484,7 +484,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(FullTextSearch)) { id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), - this, TQT_SLOT(contextSearchInDocumentation())); + this, TQ_SLOT(contextSearchInDocumentation())); popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches " "for a term under the cursor in " "the documentation. For this to work, " @@ -493,12 +493,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) } if (hasContextFeature(GotoMan)) { id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), - this, TQT_SLOT(contextManPage())); + this, TQ_SLOT(contextManPage())); popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor.")); } if (hasContextFeature(GotoInfo)) { id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed), - this, TQT_SLOT(contextInfoPage()) ); + this, TQ_SLOT(contextInfoPage()) ); popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor.")); } if (id != -1) @@ -676,7 +676,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( tdeApp->instanceName().find("kdevassistant") != -1 ) { return false; } @@ -688,7 +688,7 @@ void DocumentationPart::setAssistantUsed(bool b) { m_assistantUsed = b; //use global config to store different settings for kdevassistant and tdevelop - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("UseAssistant", isAssistantUsed()); } @@ -736,7 +736,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin void DocumentationPart::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index 02564a3f..8385f25e 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -41,7 +41,7 @@ class TQPopupMenu; */ class DocumentationPart : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index b1ab69ca..3430c440 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -64,12 +64,12 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part) m_bookmarks = new BookmarkView(this); m_tab->addItem(m_bookmarks, i18n("Bookmarks")); - connect(m_tab, TQT_SIGNAL(currentChanged(int)), this, TQT_SLOT(tabChanged(int))); + connect(m_tab, TQ_SIGNAL(currentChanged(int)), this, TQ_SLOT(tabChanged(int))); } DocumentationWidget::~DocumentationWidget() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Documentation"); config->writeEntry("LastPage", m_tab->currentIndex()); } diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index a813b393..0086163f 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -36,7 +36,7 @@ class TDEListView; class DocumentationWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DocumentationWidget(DocumentationPart *part); diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index 875f4546..013c0080 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -89,9 +89,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -106,9 +103,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index 4cd248ee..71f1c4a7 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -26,11 +26,11 @@ class DocumentationPlugin; class EditCatalogDlg : public EditCatalogBase { - Q_OBJECT + TQ_OBJECT public: EditCatalogDlg(DocumentationPlugin *plugin, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); ~EditCatalogDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 4355d579..34769563 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -63,9 +63,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -80,9 +77,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -184,9 +178,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index ebddcd4c..72563413 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <klineedit.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelistbox.h> #include <kdevpartcontroller.h> @@ -46,20 +46,20 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), last_item(0), m_widget(parent) { - TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget* tmp = TQApplication::desktop(); setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height()); - proc_man = new TDEProcess( TQT_TQOBJECT(this) ); - proc_info = new TDEProcess( TQT_TQOBJECT(this) ); + proc_man = new TDEProcess( this ); + proc_info = new TDEProcess( this ); - connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procManExited( TDEProcess* )) ); - connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); + connect( proc_man, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procManExited( TDEProcess* )) ); + connect( proc_man, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procManReadStdout( TDEProcess*, char*, int)) ); - connect( proc_info, TQT_SIGNAL(processExited( TDEProcess* )), - this, TQT_SLOT(procInfoExited( TDEProcess* )) ); - connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)), - this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); + connect( proc_info, TQ_SIGNAL(processExited( TDEProcess* )), + this, TQ_SLOT(procInfoExited( TDEProcess* )) ); + connect( proc_info, TQ_SIGNAL(receivedStdout( TDEProcess*, char*, int)), + this, TQ_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) ); result_list->header()->hide(); result_list->setSorting(-1); @@ -75,7 +75,7 @@ FindDocumentation::~FindDocumentation() void FindDocumentation::buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index b1fb6f05..b93f964f 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -32,7 +32,7 @@ class TDEProcess; class FindDocumentation : public FindDocumentationBase { -Q_OBJECT +TQ_OBJECT public: FindDocumentation(DocumentationWidget* parent, const char* name = 0); diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index ef0deaca..ee8fd976 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -108,7 +108,7 @@ void FindDocumentationOptions::sourceMoveUp() void FindDocumentationOptions::writeOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); config->writeEntry("goto_first_match", goto_first_match->isChecked()); @@ -151,7 +151,7 @@ void FindDocumentationOptions::writeOptions() void FindDocumentationOptions::readOptions() { - config = kapp->config(); + config = tdeApp->config(); config->setGroup("DocumentationFinder"); source_list->clear(); diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index ab1a3cc9..b1d0cea9 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -28,10 +28,10 @@ class TDEConfig; class FindDocumentationOptions : public FindDocumentationOptionsBase { -Q_OBJECT +TQ_OBJECT public: - FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); + FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = false); ~FindDocumentationOptions(); /*$PUBLIC_FUNCTIONS$*/ virtual bool isContents( TQCheckListItem * item ); diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index 5d85bdf1..2a31e034 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -147,9 +147,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -164,9 +161,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -210,9 +204,9 @@ sources and change their priority here.</string> <slot>sourceMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>sourceMoveUp()</slot> <slot>sourceMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index d7a4e46a..4e917917 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -148,7 +148,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>clickOptions()</slot> <slot>setSearchTerm( const TQString & term )</slot> <slot>startSearch()</slot> @@ -161,7 +161,7 @@ <slot>procInfoReadFromStdout()</slot> <slot>clickOnItem( TQListViewItem * item )</slot> <slot>buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="1" margin="1"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 3e0a3921..6024bdac 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -52,11 +52,11 @@ IndexView::IndexView(DocumentationWidget *parent, const char *name) m_index = new IndexBox(this); l->addWidget(m_index); - connect(m_index, TQT_SIGNAL(executed(TQListBoxItem* )), this, TQT_SLOT(searchInIndex(TQListBoxItem* ))); - connect(m_index, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(searchInIndex())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(showIndex(const TQString&))); + connect(m_index, TQ_SIGNAL(executed(TQListBoxItem* )), this, TQ_SLOT(searchInIndex(TQListBoxItem* ))); + connect(m_index, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem*, const TQPoint& )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListBoxItem*, const TQPoint& ))); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(searchInIndex())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(showIndex(const TQString&))); m_edit->installEventFilter(this); } @@ -123,7 +123,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) if (!watched || !e) return true; - if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_edit)) && (e->type() == TQEvent::KeyPress)) + if ((watched == m_edit) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) @@ -162,7 +162,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) void IndexView::itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; IndexItem *docItem = dynamic_cast<IndexItem*>(item); if (!docItem) diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 5538f870..d76ee504 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -30,7 +30,7 @@ class FindDocumentation; class IndexView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: IndexView(DocumentationWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 0282d82a..3b45e00a 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -24,7 +24,7 @@ #include <tqheader.h> #include <tqtextstream.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kdebug.h> @@ -168,7 +168,7 @@ IndexItem::List IndexItem::urls() const TQValueList<IndexItemProto*> itemProtos = m_listbox->items[text()]; for (TQValueList<IndexItemProto*>::const_iterator it = itemProtos.begin(); it != itemProtos.end(); ++it) - urlList.append(tqMakePair((*it)->description(), (*it)->url())); + urlList.append(qMakePair((*it)->description(), (*it)->url())); return urlList; } @@ -224,7 +224,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu y = (fm.height() + 2 + marg - boxsize) / 2; TQStyleOption opt(this); - lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); return; @@ -685,7 +685,7 @@ ProjectDocumentationPlugin::ProjectDocumentationPlugin(DocumentationPlugin *docP kdDebug() << "ProjectDocumentationPlugin::ProjectDocumentationPlugin for type " << type << endl; m_watch = new KDirWatch(this); - connect(m_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(reinit())); + connect(m_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(reinit())); m_watch->startScan(); } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index ba9d1948..0d8256f4 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -216,7 +216,7 @@ a list of URL's for the full text search tool. */ class DocumentationPlugin: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Capability of documentation plugin.*/ @@ -390,7 +390,7 @@ friend class DocumentationCatalogItem; Represents functionality to display project documentation catalog and index in documentation browser. */ class ProjectDocumentationPlugin: public TQObject { - Q_OBJECT + TQ_OBJECT public: ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type); diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index 5ac7d120..683a586f 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -24,7 +24,7 @@ class DocCHMPlugin :public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 2710fe25..793c5437 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -30,7 +30,7 @@ #include <tdeaboutdata.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdevgenericfactory.h> #include <kdevplugininfo.h> diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 19ff8a75..ad7c9a41 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -27,7 +27,7 @@ class DocDevHelpPlugin: public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index 239fc2ef..3100a5f3 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -32,7 +32,7 @@ #include <tdeaboutdata.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <urlutil.h> #include <kdevgenericfactory.h> diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index afa57cf6..36d6a61b 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -27,7 +27,7 @@ class TQDomElement; class DocDoxygenPlugin: public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index d0a00eb6..8ec45be5 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -31,7 +31,7 @@ #include <tdeconfig.h> #include <tdelocale.h> #include <tdelistview.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <urlutil.h> #include <kdevgenericfactory.h> diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index b6b5c037..5d090cec 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -26,7 +26,7 @@ class DocKDevTOCPlugin : public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 31b14b9b..10b60274 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -27,7 +27,7 @@ class TDEConfig; class DocQtPlugin : public DocumentationPlugin { - Q_OBJECT + TQ_OBJECT public: DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 787a8f32..840982ba 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kurl.h> #include <kmimemagic.h> diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index 952228c4..d182315b 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -17,11 +17,11 @@ #include "kchmpart.h" #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> extern "C" @@ -101,8 +101,8 @@ bool KChmPart::openFile() m_htmlData.truncate(0); m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 9d1812b1..12c24990 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -32,7 +32,7 @@ class TDEAboutData; class KChmPartFactory: public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); @@ -54,7 +54,7 @@ class KChmPartFactory: public KParts::Factory class KChmPart : public KDevHTMLPart { - Q_OBJECT + TQ_OBJECT public: KChmPart( TQWidget *, const char * = 0 ); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 67dca0ed..26529239 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -36,9 +36,9 @@ #include <kcombobox.h> #include <tdelocale.h> #include <kdialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdemessagebox.h> #include <kdebug.h> @@ -102,13 +102,13 @@ SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *na m_view->setAllColumnsShowFocus(true); m_view->setResizeMode( TQListView::LastColumn ); - connect(m_configButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateConfig())); - connect(m_indexButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateIndex())); - connect(m_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(search())); - connect(m_goSearchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(search())); - connect(m_view, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*))); - connect(m_view, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); + connect(m_configButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateConfig())); + connect(m_indexButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateIndex())); + connect(m_edit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(search())); + connect(m_goSearchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(search())); + connect(m_view, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(executed(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(itemMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int ))); } SearchView::~SearchView() @@ -143,7 +143,7 @@ void SearchView::search() { TDEConfig *config = m_part->config(); config->setGroup("htdig"); - if (config->readBoolEntry("IsSetup", false) == false) + if (!config->readBoolEntry("IsSetup", false)) { KMessageBox::information(this, i18n("Full text search has to be set up before usage.")); if (!m_part->configure(1)) @@ -152,7 +152,7 @@ void SearchView::search() updateIndex(); return; } - TQString exe = config->readPathEntry("htsearchbin", kapp->dirs()->findExe("htsearch")); + TQString exe = config->readPathEntry("htsearchbin", tdeApp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { KMessageBox::error(this, i18n("Cannot find the htsearch executable.\nIt is part of the ht://Dig package that is used by TDevelop to perform full text search. Please install ht://Dig and use Documentation page in Configure TDevelop dialog to set the htsearch location.")); @@ -160,7 +160,7 @@ void SearchView::search() return; } - TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf")) { @@ -177,7 +177,7 @@ void SearchView::search() } } - TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + TQString savedir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); if (!d.exists(savedir)) d.mkdir(savedir); @@ -188,17 +188,17 @@ void SearchView::search() .arg("builtin-short") .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); - kdDebug(9002) << "starting kprocess" << endl; + kdDebug(9002) << "starting tdeprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; TDEProcess *proc = new TDEProcess; - TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); + TQString picdir = tdeApp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; - connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *)) ); + connect( proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *)) ); searchResult = ""; @@ -213,12 +213,12 @@ void SearchView::search() // While receiving data from the subprocess, we want // to block the user interface, but still get repaint // events. Hack taken from NetAccess... - kapp->setOverrideCursor(waitCursor); + tdeApp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); tqt_enter_modal(&blocker); - kapp->enter_loop(); + tdeApp->enter_loop(); tqt_leave_modal(&blocker); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (!proc->normalExit() || proc->exitStatus() != 0) { @@ -254,7 +254,7 @@ void SearchView::htsearchStdout(TDEProcess *, char *buffer, int len) void SearchView::htsearchExited(TDEProcess *) { - kapp->exit_loop(); + tdeApp->exit_loop(); } void SearchView::analyseSearchResults() @@ -303,7 +303,7 @@ void SearchView::executed(TQListViewItem *item) void SearchView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index 7c3602c1..90fd5442 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -32,7 +32,7 @@ class TQListViewItem; class SearchView: public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index 6ca5ad8b..daa6e4f1 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -25,7 +25,7 @@ #include "kdevdocumentationplugin.h" class SelectTopic: public SelectTopicBase{ -Q_OBJECT +TQ_OBJECT public: SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index f57b2c10..a2931c19 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -135,8 +129,8 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>newSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index c99c4a2c..6642c5d2 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -32,8 +32,8 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <tdeversion.h> #include <kprogress.h> @@ -45,7 +45,7 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) { proc = 0; - indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); + indexdir = tdeApp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; d.mkdir(indexdir); TDEConfig config("kdevdocumentation", true); @@ -88,9 +88,9 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) setState(0); setMinimumWidth(300); - connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedStart())); + connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedStart())); } ProgressDialog::~ProgressDialog() @@ -170,14 +170,14 @@ void ProgressDialog::addDir(const TQString &dir) if (*it != "." && *it != "..") { addDir(dir + "/" + *it); - kapp->processEvents(); + tdeApp->processEvents(); } if (procdone) { return; } } - kapp->processEvents(); + tdeApp->processEvents(); } void ProgressDialog::scanDirectories() @@ -268,8 +268,8 @@ void ProgressDialog::startHtdigProcess(bool initial) if (initial) { *proc << "-i"; } - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); htdigRunning = true; @@ -302,7 +302,7 @@ bool ProgressDialog::generateIndex() // run htdig TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); - exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")); + exe = config.readPathEntry("htdigbin", tdeApp->dirs()->findExe("htdig")); if (exe.isEmpty()) { done(1); @@ -368,7 +368,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc) TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); // run htmerge ----------------------------------------------------- - exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")); + exe = config.readPathEntry("htmergebin", tdeApp->dirs()->findExe("htmerge")); if (exe.isEmpty()) { done(1); @@ -387,8 +387,8 @@ void ProgressDialog::startHtmergeProcess() kdDebug(9002) << "Running htmerge" << endl; - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); htmergeRunning = true; diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 667112a3..a5ae5225 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -24,7 +24,7 @@ class KProgress; class ProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); |