diff options
Diffstat (limited to 'konqueror/sidebar')
26 files changed, 307 insertions, 308 deletions
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index bfff3c8e7..7be580b8b 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -32,13 +32,13 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, // this should be your custom internal widget m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); - connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); - connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), - m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); - TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); - setWidget(TQT_TQWIDGET(m_widget)); + connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); + connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)), + m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&))); + TDEAcceleratorManager::setNoAccel(m_widget); + setWidget(m_widget); } TDEInstance *KonqSidebar::getInstance() @@ -79,7 +79,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // notable exception of the TDEAboutData data #include <tdeaboutdata.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> TDEInstance* KonqSidebarFactory::s_instance = 0L; TDEAboutData* KonqSidebarFactory::s_about = 0L; diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index dfdd2e2e0..0e7fbdef5 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -36,7 +36,7 @@ class KonqSidebarFactory; class KonqSidebarBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: KonqSidebarBrowserExtension(KonqSidebar *part_,Sidebar_Widget *widget_,const char *name): @@ -73,7 +73,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension */ class KonqSidebar : public KParts::ReadOnlyPart, public KonqSidebarIface { - Q_OBJECT + TQ_OBJECT public: /** @@ -111,7 +111,7 @@ class TDEAboutData; class KonqSidebarFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KonqSidebarFactory(); diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index 7540ef398..7941fb1c9 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -30,9 +30,9 @@ class KonqSidebarPluginPrivate; -class KDE_EXPORT KonqSidebarPlugin : public TQObject +class TDE_EXPORT KonqSidebarPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0); ~KonqSidebarPlugin(); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8eefa7c34..94734851c 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -25,11 +25,11 @@ #include <tqwhatsthis.h> #include <tqlayout.h> #include <tqstringlist.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <tdelocale.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kiconloader.h> #include <kicondialog.h> @@ -39,11 +39,11 @@ #include <tdefileitem.h> #include <tdeio/netaccess.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurlrequesterdlg.h> #include <kinputdialog.h> #include <tdefiledialog.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeapplication.h> #include "konqsidebar.h" @@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu, m_universal=universal; m_currentProfile = currentProfile; menu = addmenu; - connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu())); - connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int))); + connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu())); + connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int))); } void addBackEnd::aboutToShowAddMenu() @@ -88,9 +88,9 @@ void addBackEnd::aboutToShowAddMenu() for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ ) { - KDesktopFile *confFile; + TDEDesktopFile *confFile; - confFile = new KDesktopFile(*it, true); + confFile = new TDEDesktopFile(*it, true); if (! confFile->tryExec()) { delete confFile; i--; @@ -211,7 +211,7 @@ void addBackEnd::activatedAddMenu(int id) if (!myFile.isEmpty()) { kdDebug() <<"trying to save to file: "<<myFile << endl; - KSimpleConfig scf(myFile,false); + TDESimpleConfig scf(myFile,false); scf.setGroup("Desktop Entry"); for (TQMap<TQString,TQString>::ConstIterator it = map.begin(); it != map.end(); ++it) { kdDebug() <<"writing:"<<it.key()<<" / "<<it.data()<<endl; @@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (splitterWidget) { splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint); splitterWidget->setOpaqueResize( false ); - connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter())); + connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter())); } m_area = new KDockArea(this); @@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (!m_universalMode) { m_menu->insertItem(SmallIconSet("remove"), i18n("Close Navigation Panel"), - par, TQT_SLOT(deleteLater())); + par, TQ_SLOT(deleteLater())); } - connect(m_menu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowConfigMenu())); - connect(m_menu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(activatedMenu(int))); + connect(m_menu, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowConfigMenu())); + connect(m_menu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(activatedMenu(int))); m_buttonPopup = 0; addBackEnd *ab = new addBackEnd(this, addMenu, universalMode, currentProfile, "Sidebar_Widget-addBackEnd"); - connect(ab, TQT_SIGNAL(updateNeeded()), - this, TQT_SLOT(updateButtons())); - connect(ab, TQT_SIGNAL(initialCopyNeeded()), - this, TQT_SLOT(finishRollBack())); + connect(ab, TQ_SIGNAL(updateNeeded()), + this, TQ_SLOT(updateButtons())); + connect(ab, TQ_SIGNAL(initialCopyNeeded()), + this, TQ_SLOT(finishRollBack())); initialCopy(); @@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_menu->setItemVisible(2, !m_immutableShowTabsLeft); m_menu->setItemVisible(3, !m_immutableShowExtraButtons); - connect(&m_configTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(saveConfig())); + connect(&m_configTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(saveConfig())); m_somethingVisible = !m_openViews.isEmpty(); doLayout(); - TQTimer::singleShot(0,this,TQT_SLOT(createButtons())); - connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), - this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*))); + TQTimer::singleShot(0,this,TQ_SLOT(createButtons())); + connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), + this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*))); } void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { @@ -349,7 +349,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { // Go through list to see which ones exist. Check them for the URL TQStringList files = TQDir(list).entryList("websidebarplugin*.desktop"); for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it){ - KSimpleConfig scf(list + *it, false); + TDESimpleConfig scf(list + *it, false); scf.setGroup("Desktop Entry"); if (scf.readPathEntry("URL", TQString::null) == url.url()) { // We already have this one! @@ -363,7 +363,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { TQString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile); if (!myFile.isEmpty()) { - KSimpleConfig scf(myFile, false); + TDESimpleConfig scf(myFile, false); scf.setGroup("Desktop Entry"); scf.writeEntry("Type", "Link"); scf.writePathEntry("URL", url.url()); @@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web"); scf.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } @@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack() { m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true); initialCopy(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } @@ -438,7 +438,7 @@ void Sidebar_Widget::initialCopy() return; //oups; int nVersion=-1; - KSimpleConfig lcfg(m_path+".version"); + TDESimpleConfig lcfg(m_path+".version"); int lVersion=lcfg.readNumEntry("Version",0); @@ -451,7 +451,7 @@ void Sidebar_Widget::initialCopy() if ( !dirtree_dir.isEmpty() && dirtree_dir != m_path ) { - KSimpleConfig gcfg(dirtree_dir+".version"); + TDESimpleConfig gcfg(dirtree_dir+".version"); int gversion = gcfg.readNumEntry("Version", 1); nVersion=(nVersion>gversion)?nVersion:gversion; if (lVersion >= gversion) @@ -504,11 +504,11 @@ void Sidebar_Widget::buttonPopupActivate(int id) kdDebug()<<"New Icon Name:"<<iconname<<endl; if (!iconname.isEmpty()) { - KSimpleConfig ksc(m_path+m_currentButton->file); + TDESimpleConfig ksc(m_path+m_currentButton->file); ksc.setGroup("Desktop Entry"); ksc.writeEntry("Icon",iconname); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -518,7 +518,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) dlg->fileDialog()->setMode( KFile::Directory ); if (dlg->exec()) { - KSimpleConfig ksc(m_path+m_currentButton->file); + TDESimpleConfig ksc(m_path+m_currentButton->file); ksc.setGroup("Desktop Entry"); if ( !dlg->selectedURL().isValid()) { @@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) //ksc.writeEntry("Name",newurl); ksc.writePathEntry("URL",newurl); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } delete dlg; @@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) TQFile f(m_path+m_currentButton->file); if (!f.remove()) tqDebug("Error, file not deleted"); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -560,13 +560,13 @@ void Sidebar_Widget::buttonPopupActivate(int id) if(ok) { // Write the name in the .desktop file of this side button. - KSimpleConfig ksc(m_path+m_currentButton->file); + TDESimpleConfig ksc(m_path+m_currentButton->file); ksc.setGroup("Desktop Entry"); ksc.writeEntry("Name", name, true, false, true /*localized*/ ); ksc.sync(); // Update the buttons with a TQTimer (why?) - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -815,11 +815,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) int lastbtn = m_buttons.count(); m_buttons.resize(m_buttons.size()+1); - KSimpleConfig *confFile; + TDESimpleConfig *confFile; kdDebug() << "addButton:" << (m_path+desktoppath) << endl; - confFile = new KSimpleConfig(m_path+desktoppath,true); + confFile = new TDESimpleConfig(m_path+desktoppath,true); confFile->setGroup("Desktop Entry"); TQString icon = confFile->readEntry("Icon"); @@ -834,11 +834,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) { m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name); ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name, - icon, TQT_TQOBJECT(this)); + icon, this); /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); - connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int))); + connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int))); // Set Whats This help // This uses the comments in the .desktop files @@ -852,10 +852,10 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { - if ( kapp->authorize( "action/konqsidebarmenu" ) ) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) + if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) { + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) { - KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj); + KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj); if (bt) { kdDebug()<<"Request for popup"<<endl; @@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3); m_buttonPopup->insertSeparator(); m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4); - connect(m_buttonPopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(buttonPopupActivate(int))); + connect(m_buttonPopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(buttonPopupActivate(int))); } m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty()); m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName), @@ -901,8 +901,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev) { - if ( kapp->authorize( "action/konqsidebarmenu" ) ) { - if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) { + if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) { + if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) { m_menu->exec(TQCursor::pos()); } } @@ -943,8 +943,8 @@ KParts::BrowserExtension *Sidebar_Widget::getExtension() bool Sidebar_Widget::createView( ButtonInfo *data) { bool ret = true; - KSimpleConfig *confFile; - confFile = new KSimpleConfig(data->file,true); + TDESimpleConfig *confFile; + confFile = new TDESimpleConfig(data->file,true); confFile->setGroup("Desktop Entry"); data->dock = m_area->createDockWidget(confFile->readEntry("Name",i18n("Unknown")),0); @@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data) KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/); data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom); connectModule(data->module); - connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)), - data->module, TQT_SLOT(openPreview(const KFileItemList&))); + connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)), + data->module, TQ_SLOT(openPreview(const KFileItemList&))); - connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)), - data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&))); + connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)), + data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&))); } delete confFile; @@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page) m_buttonBar->setTab(page,true); connect(info->module, - TQT_SIGNAL(setIcon(const TQString&)), + TQ_SIGNAL(setIcon(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setIcon(const TQString&))); + TQ_SLOT(setIcon(const TQString&))); connect(info->module, - TQT_SIGNAL(setCaption(const TQString&)), + TQ_SIGNAL(setCaption(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setText(const TQString&))); + TQ_SLOT(setText(const TQString&))); if (m_singleWidgetMode) { @@ -1144,7 +1144,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar void Sidebar_Widget::enableAction( const char * name, bool enabled ) { - if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")) + if (sender()->parent()->isA("ButtonInfo")) { ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent()); if (btninfo) @@ -1169,7 +1169,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled ) bool Sidebar_Widget::doEnableActions() { - if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))) + if (!(sender()->parent()->isA("ButtonInfo"))) { kdDebug()<<"Couldn't set active module, aborting"<<endl; return false; @@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) { - connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*))); + connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { - connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); + connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); } - if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, - const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, + const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) { + connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, - TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, + TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { - connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), - this,TQT_SLOT(enableAction(const char *, bool))); + connect(mod,TQ_SIGNAL(enableAction( const char *, bool)), + this,TQ_SLOT(enableAction(const char *, bool))); } if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } } @@ -1323,7 +1323,7 @@ TQSplitter *Sidebar_Widget::splitter() const TQObject *p = parent(); if (!p) return 0; p = p->parent(); - return static_cast<TQSplitter*>(TQT_TQWIDGET(p)); + return static_cast<TQSplitter*>(p); } void Sidebar_Widget::userMovedSplitter() diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index b45f79b7c..7e31004ad 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -38,7 +38,7 @@ class TQStringList; class ButtonInfo: public TQObject, public KonqSidebarIface { - Q_OBJECT + TQ_OBJECT public: ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_, const TQString &url_,const TQString &lib, @@ -72,7 +72,7 @@ public: class addBackEnd: public TQObject { - Q_OBJECT + TQ_OBJECT public: addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal, const TQString ¤tProfile, const char *name=0); @@ -93,9 +93,9 @@ private: TQWidget *m_parent; }; -class KDE_EXPORT Sidebar_Widget: public TQWidget +class TDE_EXPORT Sidebar_Widget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: friend class ButtonInfo; public: diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index 2032fe202..7e1145854 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ #include "konqsidebartest.moc" -#include <kinstance.h> +#include <tdeinstance.h> extern "C" { - KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + TDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new SidebarTest(instance,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h index c5abab26c..286415557 100644 --- a/konqueror/sidebar/test/konqsidebartest.h +++ b/konqueror/sidebar/test/konqsidebartest.h @@ -22,7 +22,7 @@ class SidebarTest : public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name) diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 208fe2ee6..5e9b29236 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr formats << "text/uri-list" << "application/x-xbel" << "text/plain"; tree()->setDropFormats(formats); - connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); + TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); + TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); - KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), + KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ), m_collection, "edit_bookmarks" ); - connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule() @@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab() else return; - DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), tree()->topLevelWidget()->name()); if (bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); @@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation() if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Clipboard ); } } @@ -574,7 +574,7 @@ TQString BookmarkEditDialog::finalTitle() const extern "C" { - KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool) + TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool) { return new KonqSidebarBookmarkModule(par); } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h index ba78a2b96..b39a48601 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h @@ -34,7 +34,7 @@ class KLineEdit; */ class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: KonqSidebarBookmarkModule( KonqSidebarTree * parentTree ); virtual ~KonqSidebarBookmarkModule(); @@ -77,7 +77,7 @@ private: class BookmarkEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BookmarkEditDialog( const TQString& title, const TQString& url, diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 8368d4d37..56f77ba40 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -113,7 +113,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup if (m_fileItem->isLink()) { TQFont f( _painter->font() ); - f.setItalic( TRUE ); + f.setItalic( true ); _painter->setFont( f ); } TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index b1b6d0563..487bbf4dd 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -22,7 +22,7 @@ #include "dirtree_item.h" #include <kdebug.h> #include <kprotocolinfo.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdemessagebox.h> #include <kiconloader.h> #include <kdirlister.h> @@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule() // KDirLister may still emit canceled while being deleted. if (m_dirLister) { - disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); delete m_dirLister; } } @@ -76,7 +76,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it if(m_topLevelItem) // We can handle only one at a time ! kdError() << "KonqSidebarDirTreeModule::addTopLevelItem: Impossible, we can have only one toplevel item !" << endl; - KDesktopFile cfg( item->path(), true ); + TDEDesktopFile cfg( item->path(), true ); cfg.setDollarExpansion(true); KURL targetURL; @@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) // mimetypes<<TQString("inode/directory"); // m_dirLister->setMimeFilter(mimetypes); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } @@ -624,7 +624,7 @@ void KonqSidebarDirTreeModule::followURL( const KURL & url ) extern "C" { - KDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden) + TDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden) { return new KonqSidebarDirTreeModule(par,showHidden); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h index 89b5dcbaf..ccc607a79 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h @@ -33,7 +33,7 @@ class KonqPropsView; class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: KonqSidebarDirTreeModule( KonqSidebarTree * parentTree, bool ); virtual ~KonqSidebarDirTreeModule(); diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 44389702e..4825cfeda 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -132,18 +132,18 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) - dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); + dt = current.addDays( - s_settings->m_valueYoungerThan ); else - dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) )); + dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) ); if ( m_entry->lastVisited > dt ) p->setFont( s_settings->m_fontYoungerThan ); else { if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS ) - dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan )); + dt = current.addDays( - s_settings->m_valueOlderThan ); else - dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) )); + dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) ); if ( m_entry->lastVisited < dt ) p->setFont( s_settings->m_fontOlderThan ); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 6f051a553..f941bd0f7 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree s_settings->readSettings( true ); } - connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); + connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); @@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqHistoryManager *manager = KonqHistoryManager::kself(); - connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() )); - connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() )); + connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() )); + connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() )); - connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); - connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); + connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); + connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); - connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), - TQT_SLOT( slotItemExpanded( TQListViewItem * ))); + connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )), + TQ_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new TDEActionCollection( this, "history actions" ); (void) new TDEAction( i18n("New &Window"), "window-new", 0, this, - TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); + TQ_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this, - TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); + TQ_SLOT( slotRemoveEntry() ), m_collection, "remove"); (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, - TQT_SLOT( slotClearHistory() ), m_collection, "clear"); + TQ_SLOT( slotClearHistory() ), m_collection, "clear"); (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, - TQT_SLOT( slotPreferences()), m_collection, "preferences"); + TQ_SLOT( slotPreferences()), m_collection, "preferences"); TDERadioAction *sort; sort = new TDERadioAction( i18n("By &Name"), 0, this, - TQT_SLOT( slotSortByName() ), m_collection, "byName"); + TQ_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); sort = new TDERadioAction( i18n("By &Date"), 0, this, - TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); + TQ_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); @@ -358,7 +358,7 @@ void KonqSidebarHistoryModule::slotClearHistory() extern "C" { - KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool) + TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool) { return new KonqSidebarHistoryModule(par); } diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index 933097455..649f68150 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -38,7 +38,7 @@ class KonqSidebarTreeItem; class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule { - Q_OBJECT + TQ_OBJECT public: enum { diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index eb1621ae9..951dce28b 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -98,7 +98,7 @@ void KonqSidebarHistorySettings::applySettings() delete config; // notify konqueror instances about the new configuration - kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings", + tdeApp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings", "notifySettingsChanged()", TQByteArray() ); } diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h index 7b7d75006..f4bdebe70 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.h +++ b/konqueror/sidebar/trees/history_module/history_settings.h @@ -28,7 +28,7 @@ class KonqSidebarHistorySettings : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: enum { MINUTES, DAYS }; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 70e42e113..056d0deb7 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, dialog->comboOlder->insertItem( i18n("Days"), KonqSidebarHistorySettings::DAYS ); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - dialog->spinExpire, TQT_SLOT( setEnabled( bool ))); - connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )), - this, TQT_SLOT( slotExpireChanged( int ))); - - connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotNewerChanged( int ))); - connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotOlderChanged( int ))); - - connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontNewer() )); - connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontOlder() )); - connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotClearHistory() )); - - connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboNewer, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboOlder, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + dialog->spinExpire, TQ_SLOT( setEnabled( bool ))); + connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )), + this, TQ_SLOT( slotExpireChanged( int ))); + + connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotNewerChanged( int ))); + connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotOlderChanged( int ))); + + connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontNewer() )); + connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontOlder() )); + connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotClearHistory() )); + + connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboNewer, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboOlder, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); dialog->show(); topLayout->add(dialog); @@ -155,13 +155,13 @@ void HistorySidebarConfig::save() TQByteArray dataAge; TQDataStream streamAge( dataAge, IO_WriteOnly ); streamAge << age << "foo"; - kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", + tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager", "notifyMaxAge(TQ_UINT32, TQCString)", dataAge ); TQByteArray dataCount; TQDataStream streamCount( dataCount, IO_WriteOnly ); streamCount << count << "foo"; - kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", + tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager", "notifyMaxCount(TQ_UINT32, TQCString)", dataCount ); m_settings->m_valueYoungerThan = dialog->spinNewer->value(); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index ac82cdd60..215b78027 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -29,7 +29,7 @@ class KonqSidebarHistoryDlg; class HistorySidebarConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 514c28095..9132d531b 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -33,17 +33,17 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdirnotify_stub.h> #include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpropertiesdialog.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <stdlib.h> @@ -93,7 +93,7 @@ void KonqSidebarTree::loadModuleFactories() for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) { - KSimpleConfig ksc(*it); + TDESimpleConfig ksc(*it); ksc.setGroup("Desktop Entry"); TQString name = ksc.readEntry("X-TDE-TreeModule"); TQString libName = ksc.readEntry("X-TDE-TreeModule-Lib"); @@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg m_part = parent; m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; @@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg setTreeStepSize(15); m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); - - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); + + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); /* assert( m_part->getInterfaces()->getInstance()->dirs ); TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ @@ -390,7 +390,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url TQString filename = findUniqueFilename(path, name); destUrl.setPath(filename); - KDesktopFile cfg(filename); + TDEDesktopFile cfg(filename); cfg.writeEntry("Encoding", "UTF-8"); cfg.writeEntry("Type","Link"); cfg.writeEntry("URL", url.url()); @@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item ) void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col ) { KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item ); - if (_button == Qt::RightButton) + if (_button == TQt::RightButton) { if ( item && col < 2) { @@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem* if(_item && col < 2) { switch( _button ) { - case Qt::LeftButton: + case TQt::LeftButton: slotExecuted( item ); break; - case Qt::MidButton: + case TQt::MidButton: item->middleButtonClicked(); break; } @@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir ) kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl; if ( m_dirtreeDir.dir.isParentOf( dir ) ) // We use a timer in case of DCOP re-entrance.. - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); } void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) @@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) //kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl; if ( m_dirtreeDir.dir.isParentOf( *it ) ) { - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl; return; } @@ -610,7 +610,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path // Version 7 includes update of network places const int currentVersion = 7; TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber"); - KSimpleConfig versionCfg( path + "/.directory" ); + TDESimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 0 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; if ( versionNumber < currentVersion ) @@ -720,7 +720,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt if ( TQFile::exists( dotDirectoryFile ) ) { kdDebug(1201) << "Reading the .directory" << endl; - KSimpleConfig cfg( dotDirectoryFile, true ); + TDESimpleConfig cfg( dotDirectoryFile, true ); cfg.setDesktopGroup(); name = cfg.readEntry( "Name", name ); icon = cfg.readEntry( "Icon", icon ); @@ -755,7 +755,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQString &filename ) { - KDesktopFile cfg( filename, true ); + TDEDesktopFile cfg( filename, true ); cfg.setDollarExpansion(true); TQFileInfo inf( filename ); @@ -883,7 +883,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste, bool KonqSidebarTree::tabSupport() { // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) - DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name()); DCOPReply reply = ref.call("functions()"); if (reply.isValid()) { QCStringList funcs; @@ -908,22 +908,22 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { m_collection = new TDEActionCollection( this, "bookmark actions" ); - (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this, + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); + (void) new TDEAction( i18n("Rename"), 0, this, + TQ_SLOT( slotRename() ), m_collection, "rename"); + (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, + TQ_SLOT( slotDelete() ), m_collection, "delete_link"); + (void) new TDEAction( i18n("Properties"), "edit", 0, this, + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); + (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); + (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } TQPopupMenu *menu = new TQPopupMenu; @@ -1012,7 +1012,6 @@ void KonqSidebarTree::slotProperties() KPropertiesDialog *dlg = new KPropertiesDialog( url ); dlg->setFileNameReadOnly(true); dlg->exec(); - delete dlg; } void KonqSidebarTree::slotOpenNewWindow() @@ -1024,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow() void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; - DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); + DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name()); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } @@ -1032,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation() { if (!m_currentTopLevelItem) return; KURL url = m_currentTopLevelItem->externalURL(); - kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); - kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); + tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection ); + tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard ); } /////////////////////////////////////////////////////////////////// diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index 703a256c9..f76027481 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -75,7 +75,7 @@ typedef enum { */ class KonqSidebarTree : public TDEListView, public KDirNotify { - Q_OBJECT + TQ_OBJECT public: KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ); virtual ~KonqSidebarTree(); diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index 0ba22363f..bafcb973e 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -35,7 +35,7 @@ void KonqSidebarTreeTopLevelItem::init() TQString desktopFile = m_path; if ( isTopLevelGroup() ) desktopFile += "/.directory"; - KSimpleConfig cfg( desktopFile, true ); + TDESimpleConfig cfg( desktopFile, true ); cfg.setDesktopGroup(); m_comment = cfg.readEntry( "Comment" ); } @@ -189,7 +189,7 @@ void KonqSidebarTreeTopLevelItem::rename( const TQString & name ) TQString desktopFile = m_path; if ( isTopLevelGroup() ) desktopFile += "/.directory"; - KSimpleConfig cfg( desktopFile ); + TDESimpleConfig cfg( desktopFile ); cfg.setDesktopGroup(); cfg.writeEntry( "Name", name ); cfg.sync(); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 1903c2328..9baa24d1d 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -2,8 +2,8 @@ #include "konqsidebar_tree.moc" #include "konq_sidebartree.h" #include <kdebug.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <kinputdialog.h> #include <kiconloader.h> #include <tdelistviewsearchline.h> @@ -17,7 +17,7 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { - KSimpleConfig ksc(desktopName_); + TDESimpleConfig ksc(desktopName_); ksc.setGroup("Desktop Entry"); int virt= ( (ksc.readEntry("X-TDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link); if (virt==1) desktopName_=ksc.readEntry("X-TDE-RelURL",""); @@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); } else tree=new KonqSidebarTree(this,widget,virt,desktopName_); - connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); - connect(tree,TQT_SIGNAL(enableAction( const char *, bool )), - this,TQT_SIGNAL(enableAction( const char *, bool))); + connect(tree,TQ_SIGNAL(enableAction( const char *, bool )), + this,TQ_SIGNAL(enableAction( const char *, bool))); } @@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename() extern "C" { - KDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + TDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new KonqSidebar_Tree(inst,par,widp,desktopname,name); } @@ -132,14 +132,14 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) + TDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) { TDEStandardDirs *dirs=TDEGlobal::dirs(); TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); TQStringList names; for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it) { - KSimpleConfig sc(*it); + TDESimpleConfig sc(*it); sc.setGroup("Desktop Entry"); names<<sc.readEntry("Name"); } @@ -150,7 +150,7 @@ extern "C" { int id=names.findIndex( item ); if (id==-1) return false; - KSimpleConfig ksc2(*list.at(id)); + TDESimpleConfig ksc2(*list.at(id)); ksc2.setGroup("Desktop Entry"); map->insert("Type","Link"); map->insert("Icon",ksc2.readEntry("Icon")); diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index bdc58ad0c..25b616bd6 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -16,7 +16,7 @@ class TQVBox; class KonqSidebar_Tree: public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_Tree(); diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 44a94f02c..559f7bfeb 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -29,47 +29,47 @@ #include <tdelocale.h> #include <konq_pixmapprovider.h> #include <tdeparts/browserextension.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new TDEHTMLSideBar(universalMode()); - connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload())); - connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded())); + connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload())); + connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded())); connect(_htmlPart, - TQT_SIGNAL(setWindowCaption(const TQString&)), + TQ_SIGNAL(setWindowCaption(const TQString&)), this, - TQT_SLOT(setTitle(const TQString&))); + TQ_SLOT(setTitle(const TQString&))); connect(_htmlPart, - TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs))); connect(_htmlPart->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, - TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); + TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); connect(_htmlPart, - TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() )); + TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() )); connect(_htmlPart, - TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); connect(_htmlPart, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); _desktopName = desktopName; - KSimpleConfig ksc(_desktopName); + TDESimpleConfig ksc(_desktopName); ksc.setGroup("Desktop Entry"); reloadTimeout = ksc.readNumEntry("Reload", 0); _url = ksc.readPathEntry("URL"); _htmlPart->openURL(_url ); // Must load this delayed - TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon())); + TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon())); } @@ -102,7 +102,7 @@ void KonqSideBarWebModule::setAutoReload(){ if( dlg.exec() == TQDialog::Accepted ) { int msec = ( mins->value() * 60 + secs->value() ) * 1000; reloadTimeout = msec; - KSimpleConfig ksc(_desktopName); + TDESimpleConfig ksc(_desktopName); ksc.setGroup("Desktop Entry"); ksc.writeEntry("Reload", reloadTimeout); reload(); @@ -147,7 +147,7 @@ void KonqSideBarWebModule::loadFavicon() { if (!icon.isEmpty()) { emit setIcon(icon); - KSimpleConfig ksc(_desktopName); + TDESimpleConfig ksc(_desktopName); ksc.setGroup("Desktop Entry"); if (icon != ksc.readPathEntry("Icon")) { ksc.writePathEntry("Icon", icon); @@ -165,7 +165,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) { if (!title.isEmpty()) { emit setCaption(title); - KSimpleConfig ksc(_desktopName); + TDESimpleConfig ksc(_desktopName); ksc.setGroup("Desktop Entry"); if (title != ksc.readPathEntry("Name")) { ksc.writePathEntry("Name", title); @@ -176,20 +176,20 @@ void KonqSideBarWebModule::setTitle(const TQString& title) { void KonqSideBarWebModule::pageLoaded() { if( reloadTimeout > 0 ) { - TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) ); + TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) ); } } extern "C" { - KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { + TDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { return new KonqSideBarWebModule(instance, parent, widget, desktopName, name); } } extern "C" { - KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { + TDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { Q_UNUSED(param); TDEGlobal::dirs()->addResourceType("websidebardata", TDEStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); KURL url; diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 938677d8d..072c3d822 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -31,7 +31,7 @@ // A wrapper for TDEHTMLPart to make it behave the way we want it to. class TDEHTMLSideBar : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: TDEHTMLSideBar(bool universal) : TDEHTMLPart() { setStatusMessagesEnabled(false); @@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart setFormNotification(TDEHTMLPart::Only); connect(this, - TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) + TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) ); @@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadNewWindow())); + this, TQ_SLOT(loadNewWindow())); } else { _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); } _menu = new TDEPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), - this, TQT_SIGNAL(reload())); - _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); + this, TQ_SIGNAL(reload())); + _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQ_SIGNAL(setAutoReload())); connect(this, - TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)), + TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)), this, - TQT_SLOT(showMenu(const TQString&, const TQPoint&))); + TQ_SLOT(showMenu(const TQString&, const TQPoint&))); } virtual ~TDEHTMLSideBar() {} @@ -82,7 +82,7 @@ class TDEHTMLSideBar : public TDEHTMLPart virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()) { - if (button == Qt::LeftButton ){ + if (button == TQt::LeftButton ){ if (_target.lower() == "_self") { openURL(url); } else if (_target.lower() == "_blank") { @@ -92,7 +92,7 @@ class TDEHTMLSideBar : public TDEHTMLPart } return; } - if (button == Qt::MidButton) { + if (button == TQt::MidButton) { emit openURLNewWindow(completeURL(url).url(), args); return; @@ -164,7 +164,7 @@ class TDEHTMLSideBar : public TDEHTMLPart class KonqSideBarWebModule : public KonqSidebarPlugin { - Q_OBJECT + TQ_OBJECT public: KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, |