diff options
Diffstat (limited to 'src/svnfrontend')
71 files changed, 369 insertions, 450 deletions
diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui index f4ec033..303e713 100644 --- a/src/svnfrontend/blamedisplay.ui +++ b/src/svnfrontend/blamedisplay.ui @@ -100,10 +100,10 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">slotContextMenuRequested(TDEListView*,TQListViewItem*, const TQPoint&)</slot> <slot access="protected">slotItemDoubleClicked(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 0acc9bc..9d48155 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -20,7 +20,7 @@ #include "blamedisplay_impl.h" #include "simple_logcb.h" #include "tdesvnsettings.h" -#include "log_entry.hpp" +#include "log_entry.h" #include "cursorstack.h" #include "widgetblockstack.h" #include "encodingselector_impl.h" @@ -247,14 +247,14 @@ BlameDisplay_impl::BlameDisplay_impl(TQWidget*parent,const char*name) : BlameDisplay(parent,name) { m_Data = new BlameDisplayData(); - connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); + connect(m_BlameList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged())); } BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*parent,const char*name) : BlameDisplay(parent,name) { m_Data = new BlameDisplayData(); - connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); + connect(m_BlameList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged())); setContent(what,blame); } @@ -268,8 +268,8 @@ void BlameDisplay_impl::setContent(const TQString&what,const svn::AnnotatedFile& m_Data->m_File = what; m_SearchWidget = new TDEListViewSearchLineWidget(m_BlameList,this); EncodingSelector_impl*m_Ls = new EncodingSelector_impl(Kdesvnsettings::locale_for_blame(),this); - connect(m_Ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), - this,TQT_SLOT(slotTextCodecChanged(const TQString&))); + connect(m_Ls,TQ_SIGNAL(TextCodecChanged(const TQString&)), + this,TQ_SLOT(slotTextCodecChanged(const TQString&))); BlameDisplayLayout->remove(m_BlameList); BlameDisplayLayout->addWidget(m_Ls); @@ -410,7 +410,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) } } KDialogBase* dlg = new KDialogBase( - TQT_TQWIDGET(TDEApplication::activeModalWidget()), + TDEApplication::activeModalWidget(), "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())), KDialogBase::Close); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); @@ -446,7 +446,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s { int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2; KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(TDEApplication::activeModalWidget()), + TDEApplication::activeModalWidget(), name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false, KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog")); @@ -457,8 +457,8 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s ptr->setCb(_cb); ptr->m_Data->m_dlg = dlg; dlg->enableButton(KDialogBase::User2,false); - connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(slotGoLine())); - connect(dlg,TQT_SIGNAL(user2Clicked()),ptr,TQT_SLOT(slotShowCurrentCommit())); + connect(dlg,TQ_SIGNAL(user1Clicked()),ptr,TQ_SLOT(slotGoLine())); + connect(dlg,TQ_SIGNAL(user2Clicked()),ptr,TQ_SLOT(slotShowCurrentCommit())); Dialog1Layout->adjustSize(); dlg->exec(); diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h index e248b35..43b6708 100644 --- a/src/svnfrontend/blamedisplay_impl.h +++ b/src/svnfrontend/blamedisplay_impl.h @@ -21,7 +21,7 @@ #define BLAMEDISPLAY_IMPL_H #include "blamedisplay.h" -#include "client.hpp" +#include "client.h" class BlameDisplayData; class SimpleLogCb; @@ -30,7 +30,7 @@ class TDEListViewSearchLineWidget; class BlameDisplay_impl:public BlameDisplay { - Q_OBJECT + TQ_OBJECT public: BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*parent=0,const char*name=0); diff --git a/src/svnfrontend/cacheentry.h b/src/svnfrontend/cacheentry.h index fd9ae64..d2a7787 100644 --- a/src/svnfrontend/cacheentry.h +++ b/src/svnfrontend/cacheentry.h @@ -20,9 +20,9 @@ #ifndef HELPERSCACHEENTRY_H #define HELPERSCACHEENTRY_H -#include "svnqttypes.hpp" -#include "shared_pointer.hpp" -#include "status.hpp" +#include "svnqttypes.h" +#include "shared_pointer.h" +#include "status.h" // std::map 'cause TQMap isn't usable #include <map> diff --git a/src/svnfrontend/ccontextlistener.h b/src/svnfrontend/ccontextlistener.h index a280782..b5f0966 100644 --- a/src/svnfrontend/ccontextlistener.h +++ b/src/svnfrontend/ccontextlistener.h @@ -20,8 +20,8 @@ #ifndef CCONTEXTLISTENER_H #define CCONTEXTLISTENER_H -#include "context_listener.hpp" -#include "smart_pointer.hpp" +#include "context_listener.h" +#include "smart_pointer.h" #include <tqobject.h> #include <tqstring.h> @@ -33,7 +33,7 @@ class CContextListenerData; */ class CContextListener : public TQObject, public svn::ContextListener,public svn::ref_count { - Q_OBJECT + TQ_OBJECT public: CContextListener(TQObject *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index 953f33a..822f3e3 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -21,9 +21,9 @@ #include "tdesvnsettings.h" #include "svnactions.h" #include "dummydisplay.h" -#include "targets.hpp" -#include "url.hpp" -#include "dirent.hpp" +#include "targets.h" +#include "url.h" +#include "dirent.h" #include "sub2qt.h" #include "ktranslateurl.h" #include "sshagent.h" @@ -79,8 +79,8 @@ pCPart::pCPart() end = svn::Revision::UNDEFINED; toStdout.open(IO_WriteOnly, stdout); toStderr.open(IO_WriteOnly, stderr); - Stdout.setDevice(TQT_TQIODEVICE(&toStdout)); - Stderr.setDevice(TQT_TQIODEVICE(&toStderr)); + Stdout.setDevice(&toStdout); + Stderr.setDevice(&toStderr); disp = new DummyDisplay(); m_SvnWrapper = new SvnActions(disp,0,true); } @@ -99,8 +99,8 @@ CommandExec::CommandExec(TQObject*parent, const char *name,TDECmdLineArgs *args) SshAgent ag; ag.querySshAgent(); - connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(clientException(const TQString&))); - connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); + connect(m_pCPart->m_SvnWrapper,TQ_SIGNAL(clientException(const TQString&)),this,TQ_SLOT(clientException(const TQString&))); + connect(m_pCPart->m_SvnWrapper,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&))); m_pCPart->m_SvnWrapper->reInitClient(); } @@ -130,86 +130,86 @@ int CommandExec::exec() } TQString slotCmd; if (!TQString::compare(m_pCPart->cmd,"log")) { - slotCmd=TQT_SLOT(slotCmd_log()); + slotCmd=TQ_SLOT(slotCmd_log()); } else if (!TQString::compare(m_pCPart->cmd,"cat")) { - slotCmd=TQT_SLOT(slotCmd_cat()); + slotCmd=TQ_SLOT(slotCmd_cat()); m_pCPart->single_revision=true; } else if (!TQString::compare(m_pCPart->cmd,"get")) { - slotCmd=TQT_SLOT(slotCmd_get()); + slotCmd=TQ_SLOT(slotCmd_get()); m_pCPart->single_revision=true; } else if (!TQString::compare(m_pCPart->cmd,"help")) { - slotCmd=TQT_SLOT(slotCmd_help()); + slotCmd=TQ_SLOT(slotCmd_help()); } else if (!TQString::compare(m_pCPart->cmd,"blame")|| !TQString::compare(m_pCPart->cmd,"annotate")) { - slotCmd=TQT_SLOT(slotCmd_blame()); + slotCmd=TQ_SLOT(slotCmd_blame()); } else if (!TQString::compare(m_pCPart->cmd,"update")) { - slotCmd=TQT_SLOT(slotCmd_update()); + slotCmd=TQ_SLOT(slotCmd_update()); m_pCPart->single_revision=true; } else if (!TQString::compare(m_pCPart->cmd,"diff")) { m_pCPart->start = svn::Revision::WORKING; - slotCmd=TQT_SLOT(slotCmd_diff()); + slotCmd=TQ_SLOT(slotCmd_diff()); } else if (!TQString::compare(m_pCPart->cmd,"info")) { - slotCmd=TQT_SLOT(slotCmd_info()); + slotCmd=TQ_SLOT(slotCmd_info()); m_pCPart->single_revision=true; } else if (!TQString::compare(m_pCPart->cmd,"commit")|| !TQString::compare(m_pCPart->cmd,"ci")) { - slotCmd=TQT_SLOT(slotCmd_commit()); + slotCmd=TQ_SLOT(slotCmd_commit()); } else if (!TQString::compare(m_pCPart->cmd,"list")|| !TQString::compare(m_pCPart->cmd,"ls")) { - slotCmd=TQT_SLOT(slotCmd_list()); + slotCmd=TQ_SLOT(slotCmd_list()); } else if (!TQString::compare(m_pCPart->cmd,"copy")|| !TQString::compare(m_pCPart->cmd,"cp")) { - slotCmd=TQT_SLOT(slotCmd_copy()); + slotCmd=TQ_SLOT(slotCmd_copy()); dont_check_second = true; } else if (!TQString::compare(m_pCPart->cmd,"move")|| !TQString::compare(m_pCPart->cmd,"rename")|| !TQString::compare(m_pCPart->cmd,"mv")) { - slotCmd=TQT_SLOT(slotCmd_move()); + slotCmd=TQ_SLOT(slotCmd_move()); dont_check_second = true; } else if (!TQString::compare(m_pCPart->cmd,"checkout")|| !TQString::compare(m_pCPart->cmd,"co")) { - slotCmd=TQT_SLOT(slotCmd_checkout()); + slotCmd=TQ_SLOT(slotCmd_checkout()); dont_check_second = true; } else if (!TQString::compare(m_pCPart->cmd,"checkoutto")|| !TQString::compare(m_pCPart->cmd,"coto")) { - slotCmd=TQT_SLOT(slotCmd_checkoutto()); + slotCmd=TQ_SLOT(slotCmd_checkoutto()); dont_check_second = true; } else if (!TQString::compare(m_pCPart->cmd,"export")) { - slotCmd=TQT_SLOT(slotCmd_export()); + slotCmd=TQ_SLOT(slotCmd_export()); dont_check_second = true; } else if (!TQString::compare(m_pCPart->cmd,"exportto")) { - slotCmd=TQT_SLOT(slotCmd_exportto()); + slotCmd=TQ_SLOT(slotCmd_exportto()); dont_check_second = true; } else if (!TQString::compare(m_pCPart->cmd,"delete")|| !TQString::compare(m_pCPart->cmd,"del")|| !TQString::compare(m_pCPart->cmd,"rm")|| !TQString::compare(m_pCPart->cmd,"remove")) { - slotCmd=TQT_SLOT(slotCmd_delete()); + slotCmd=TQ_SLOT(slotCmd_delete()); } else if (!TQString::compare(m_pCPart->cmd,"add")) { - slotCmd=TQT_SLOT(slotCmd_add()); + slotCmd=TQ_SLOT(slotCmd_add()); dont_check_all = true; path_only=true; } else if (!TQString::compare(m_pCPart->cmd,"undo")|| !TQString::compare(m_pCPart->cmd,"revert")) { - slotCmd=TQT_SLOT(slotCmd_revert()); + slotCmd=TQ_SLOT(slotCmd_revert()); } else if (!TQString::compare(m_pCPart->cmd,"checknew")|| !TQString::compare(m_pCPart->cmd,"addnew")) { - slotCmd=TQT_SLOT(slotCmd_addnew()); + slotCmd=TQ_SLOT(slotCmd_addnew()); } else if (!TQString::compare(m_pCPart->cmd,"switch")) { - slotCmd=TQT_SLOT(slotCmd_switch()); + slotCmd=TQ_SLOT(slotCmd_switch()); } else if (!TQString::compare(m_pCPart->cmd,"tree")) { - slotCmd=TQT_SLOT(slotCmd_tree()); + slotCmd=TQ_SLOT(slotCmd_tree()); } else if (!TQString::compare(m_pCPart->cmd,"lock")) { - slotCmd=TQT_SLOT(slotCmd_lock()); + slotCmd=TQ_SLOT(slotCmd_lock()); no_revision = true; check_force=true; } else if (!TQString::compare(m_pCPart->cmd,"unlock")) { - slotCmd=TQT_SLOT(slotCmd_unlock()); + slotCmd=TQ_SLOT(slotCmd_unlock()); no_revision=true; check_force=true; } - bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii()); + bool found = connect(this,TQ_SIGNAL(executeMe()),this,slotCmd.ascii()); if (!found) { slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd); KMessageBox::sorry(0,slotCmd,i18n("SVN Error")); @@ -314,7 +314,7 @@ int CommandExec::exec() if (Kdesvnsettings::self()->cmdline_show_logwindow() && m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) { KDialogBase dlg ( - TQT_TQWIDGET(TDEApplication::activeModalWidget()), + TDEApplication::activeModalWidget(), "execution_log", true, i18n("Execution log"), diff --git a/src/svnfrontend/commandexec.h b/src/svnfrontend/commandexec.h index 7455ea7..e827728 100644 --- a/src/svnfrontend/commandexec.h +++ b/src/svnfrontend/commandexec.h @@ -36,7 +36,7 @@ namespace svn { */ class CommandExec : public TQObject { -Q_OBJECT +TQ_OBJECT public: CommandExec(TQObject*parent,const char *name,TDECmdLineArgs *args); diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui index c1af479..8976349 100644 --- a/src/svnfrontend/copymoveview.ui +++ b/src/svnfrontend/copymoveview.ui @@ -85,9 +85,6 @@ <property name="text"> <string>Force operation</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> diff --git a/src/svnfrontend/copymoveview_impl.h b/src/svnfrontend/copymoveview_impl.h index 5b4b22d..c4f8376 100644 --- a/src/svnfrontend/copymoveview_impl.h +++ b/src/svnfrontend/copymoveview_impl.h @@ -25,7 +25,7 @@ class CopyMoveView_impl : public CopyMoveView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui index 64d73e4..ca09e14 100644 --- a/src/svnfrontend/createrepo_dlg.ui +++ b/src/svnfrontend/createrepo_dlg.ui @@ -87,9 +87,6 @@ <property name="text"> <string>Disable fsync at commit (BDB only)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -98,9 +95,6 @@ <property name="text"> <string>Disable automatic log file removal (BDB only)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -109,9 +103,6 @@ <property name="text"> <string>Create main folders</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -192,11 +183,11 @@ <tabstop>m_svn13compat</tabstop> <tabstop>m_svn14compat</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">fsTypeChanged(int)</slot> <slot access="protected">compatChanged13(bool)</slot> <slot access="protected">compatChanged14(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/src/svnfrontend/createrepo_impl.h b/src/svnfrontend/createrepo_impl.h index 54756b2..547d18b 100644 --- a/src/svnfrontend/createrepo_impl.h +++ b/src/svnfrontend/createrepo_impl.h @@ -23,7 +23,7 @@ #include "createrepo_dlg.h" class Createrepo_impl: public CreateRepo_Dlg { - Q_OBJECT + TQ_OBJECT public: Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui index 0d15e28..84844f4 100644 --- a/src/svnfrontend/dumprepo_dlg.ui +++ b/src/svnfrontend/dumprepo_dlg.ui @@ -71,9 +71,6 @@ <property name="text"> <string>incremental Dump</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -85,9 +82,6 @@ <property name="text"> <string>Use deltas</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -99,9 +93,6 @@ <property name="text"> <string>Dump revision range</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> @@ -181,9 +172,9 @@ <slot>slotDumpRange(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotDumpRange(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/src/svnfrontend/dumprepo_impl.h b/src/svnfrontend/dumprepo_impl.h index 3f17f3e..0ba89a1 100644 --- a/src/svnfrontend/dumprepo_impl.h +++ b/src/svnfrontend/dumprepo_impl.h @@ -23,7 +23,7 @@ #include "dumprepo_dlg.h" class DumpRepo_impl: public DumpRepoDlg { -Q_OBJECT +TQ_OBJECT public: DumpRepo_impl(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp index c87ff8b..b1bcca2 100644 --- a/src/svnfrontend/editproperty_impl.cpp +++ b/src/svnfrontend/editproperty_impl.cpp @@ -123,7 +123,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name) isDir = false; TQToolTip::add(m_NameEdit, "Select or enter new property"); - connect(m_NameEdit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateToolTip(const TQString &))); + connect(m_NameEdit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateToolTip(const TQString &))); } diff --git a/src/svnfrontend/editproperty_impl.h b/src/svnfrontend/editproperty_impl.h index 6008971..ca1bbce 100644 --- a/src/svnfrontend/editproperty_impl.h +++ b/src/svnfrontend/editproperty_impl.h @@ -26,7 +26,7 @@ class TQStringList; class TQString; class EditProperty_impl: public EditPropsDlgData { -Q_OBJECT +TQ_OBJECT public: EditProperty_impl(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui index 5e06fd9..e9ef89f 100644 --- a/src/svnfrontend/editpropsdlg.ui +++ b/src/svnfrontend/editpropsdlg.ui @@ -51,9 +51,6 @@ <property name="text"> <string>OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -68,9 +65,6 @@ <property name="text"> <string>Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -166,9 +160,6 @@ <property name="pixmap"> <pixmap>image0</pixmap> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Click for short info about pre-defined property name</string> </property> @@ -230,11 +221,11 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">nameChanged(const TQString&)</slot> <slot access="protected">valueChanged()</slot> <slot access="protected">showHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 615ea4c..0eee5bc 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -21,10 +21,10 @@ #include "tdesvnfilelist.h" #include "tdesvnsettings.h" #include "helpers/sub2qt.h" -#include "status.hpp" -#include "revision.hpp" -#include "exception.hpp" -#include "url.hpp" +#include "status.h" +#include "revision.h" +#include "exception.h" +#include "url.h" #include "widgetblockstack.h" #include <tdelocale.h> diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h index 6886511..4f130c9 100644 --- a/src/svnfrontend/filelistviewitem.h +++ b/src/svnfrontend/filelistviewitem.h @@ -24,7 +24,7 @@ #include <tdelistview.h> #include <tqdatetime.h> #include <tqptrlist.h> -#include "svnqttypes.hpp" +#include "svnqttypes.h" class TQPainter; class KFileItem; diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index f7619fe..5958928 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -20,9 +20,9 @@ #include "fillcachethread.h" #include "tcontextlistener.h" -#include "LogCache.hpp" -#include "ReposLog.hpp" -#include "DatabaseException.hpp" +#include "LogCache.h" +#include "ReposLog.h" +#include "DatabaseException.h" #include "tdesvn_events.h" #include <tqobject.h> @@ -37,7 +37,7 @@ FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot) m_CurrentContext = new svn::Context(); m_SvnContextListener = new ThreadContextListener(m_Parent); - TQObject::connect(m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); + TQObject::connect(m_SvnContextListener,TQ_SIGNAL(sendNotify(const TQString&)),m_Parent,TQ_SLOT(slotNotifyMessage(const TQString&))); m_CurrentContext->setListener(m_SvnContextListener); m_what = reposRoot; diff --git a/src/svnfrontend/fillcachethread.h b/src/svnfrontend/fillcachethread.h index 1b20e73..735726e 100644 --- a/src/svnfrontend/fillcachethread.h +++ b/src/svnfrontend/fillcachethread.h @@ -20,9 +20,9 @@ #ifndef _FILLCACHE_THREAD_H #define _FILLCACHE_THREAD_H -#include "client.hpp" -#include "revision.hpp" -#include "status.hpp" +#include "client.h" +#include "revision.h" +#include "status.h" #include "ccontextlistener.h" #include "eventnumbers.h" #include "frontendtypes.h" diff --git a/src/svnfrontend/frontendtypes.h b/src/svnfrontend/frontendtypes.h index 0f45ecf..a34f460 100644 --- a/src/svnfrontend/frontendtypes.h +++ b/src/svnfrontend/frontendtypes.h @@ -1,7 +1,7 @@ #ifndef _FRONTEND_TYPES_H #define _FRONTEND_TYPES_H -#include "svnqt/shared_pointer.hpp" +#include "svnqt/shared_pointer.h" class ThreadContextListener; diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui index 8f3ed80..eaa5708 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo.ui +++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui @@ -109,9 +109,6 @@ <property name="text"> <string>Overwrite existing</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> @@ -206,9 +203,9 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<Q_SLOTS> +<slots> <slot access="protected">urlChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="2" margin="2"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp index 3dad68d..9a06738 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp @@ -20,7 +20,7 @@ #include "checkoutinfo_impl.h" #include "rangeinput_impl.h" #include "depthselector.h" -#include "url.hpp" +#include "url.h" #include "ktranslateurl.h" #include <kurlrequester.h> #include <tqlabel.h> diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h index eb567f4..8836ba0 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h @@ -21,12 +21,12 @@ #define CHECKOUTINFO_IMPL_H #include "checkoutinfo.h" -#include "revision.hpp" -#include "svnqttypes.hpp" +#include "revision.h" +#include "svnqttypes.h" #include "kurl.h" class CheckoutInfo_impl: public CheckoutInfo { -Q_OBJECT +TQ_OBJECT public: CheckoutInfo_impl(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 1f46571..7503b08 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -35,10 +35,10 @@ Propertylist::Propertylist(TQWidget *parent, const char *name) setRootIsDecorated(false); setSortColumn(0); setAcceptDrops(false); - connect(this,TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); + connect(this,TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQ_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, - TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, + TQ_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); //setFullWidth( TRUE ); } @@ -150,8 +150,8 @@ bool Propertylist::checkExisting(const TQString&aName,TQListViewItem*it) void Propertylist::addCallback(TQObject*ob) { if (ob) { - connect(this,TQT_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)), - ob,TQT_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&))); + connect(this,TQ_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)), + ob,TQ_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&))); } } diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h index 71c72e0..a777db0 100644 --- a/src/svnfrontend/fronthelpers/propertylist.h +++ b/src/svnfrontend/fronthelpers/propertylist.h @@ -21,14 +21,14 @@ #define PROPERTYLIST_H #include <tdelistview.h> -#include "svnqttypes.hpp" +#include "svnqttypes.h" /** @author */ class Propertylist : public TDEListView { - Q_OBJECT + TQ_OBJECT public: Propertylist(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/fronthelpers/rangeinput.ui b/src/svnfrontend/fronthelpers/rangeinput.ui index 16e806f..03c6a50 100644 --- a/src/svnfrontend/fronthelpers/rangeinput.ui +++ b/src/svnfrontend/fronthelpers/rangeinput.ui @@ -69,9 +69,6 @@ <property name="text"> <string>Date</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> @@ -162,9 +159,6 @@ <property name="text"> <string>Date</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> @@ -259,7 +253,7 @@ <tabstop>m_stopStartButton</tabstop> <tabstop>m_stopHeadButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">stopHeadToggled(bool)</slot> <slot access="protected">stopBaseToggled(bool)</slot> <slot access="protected">stopNumberToggled(bool)</slot> @@ -268,7 +262,7 @@ <slot access="protected">startNumberToggled(bool)</slot> <slot access="protected">startDateToggled(bool)</slot> <slot access="protected">stopDateToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="2" margin="2"/> <includes> <include location="global" impldecl="in implementation">kdatetimewidget.h</include> diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.h b/src/svnfrontend/fronthelpers/rangeinput_impl.h index aaa27a4..eab11e3 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.h +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.h @@ -21,11 +21,11 @@ #define RANGEINPUT_IMPL_H #include "rangeinput.h" -#include "revision.hpp" +#include "revision.h" #include <tqpair.h> class Rangeinput_impl: public RangeInputDlg { -Q_OBJECT +TQ_OBJECT public: Rangeinput_impl(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/fronthelpers/revisionbutton.ui b/src/svnfrontend/fronthelpers/revisionbutton.ui index b517e7e..989f327 100644 --- a/src/svnfrontend/fronthelpers/revisionbutton.ui +++ b/src/svnfrontend/fronthelpers/revisionbutton.ui @@ -45,9 +45,9 @@ <slot>askRevision()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>askRevision()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index 66e299a..c64cbd6 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -50,7 +50,7 @@ void RevisionButtonImpl::askRevision() Rangeinput_impl*rdlg; int buttons = KDialogBase::Ok|KDialogBase::Cancel; - KDialogBase * dlg = new KDialogBase(TQT_TQWIDGET(TDEApplication::activeModalWidget()),"Revinput",true,i18n("Select revision"),buttons); + KDialogBase * dlg = new KDialogBase(TDEApplication::activeModalWidget(),"Revinput",true,i18n("Select revision"),buttons); if (!dlg) { return; diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h index bec5124..04a04a0 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h @@ -21,10 +21,10 @@ #define REVISIONBUTTONIMPL_H #include "revisionbutton.h" -#include "svnqt/revision.hpp" +#include "svnqt/revision.h" class RevisionButtonImpl: public RevisionButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/svnfrontend/graphtree/elogentry.h b/src/svnfrontend/graphtree/elogentry.h index 3bcbabc..d9490b6 100644 --- a/src/svnfrontend/graphtree/elogentry.h +++ b/src/svnfrontend/graphtree/elogentry.h @@ -20,7 +20,7 @@ #ifndef ELOGENTRY_H #define ELOGENTRY_H -#include <svnqt/log_entry.hpp> +#include <svnqt/log_entry.h> /** @author Rajko Albrecht <ral@alwins-world.de> diff --git a/src/svnfrontend/graphtree/pannerview.h b/src/svnfrontend/graphtree/pannerview.h index 5f67dc3..77fc724 100644 --- a/src/svnfrontend/graphtree/pannerview.h +++ b/src/svnfrontend/graphtree/pannerview.h @@ -27,7 +27,7 @@ */ class PannerView : public TQCanvasView { -Q_OBJECT +TQ_OBJECT public: PannerView(TQWidget* parent=0, const char* name=0); diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index 416b6e9..db95554 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -23,7 +23,7 @@ #include "graphtree_defines.h" #include "tdesvnsettings.h" #include "stopdlg.h" -#include "client.hpp" +#include "client.h" #include <kapp.h> #include <kdebug.h> @@ -92,12 +92,12 @@ RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * par m_CompleteView->setHScrollBarMode(TQScrollView::AlwaysOff); m_CompleteView->raise(); m_CompleteView->hide(); - connect(this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(contentsMovingSlot(int,int))); - connect(m_CompleteView, TQT_SIGNAL(zoomRectMoved(int,int)), - this, TQT_SLOT(zoomRectMoved(int,int))); - connect(m_CompleteView, TQT_SIGNAL(zoomRectMoveFinished()), - this, TQT_SLOT(zoomRectMoveFinished())); + connect(this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(contentsMovingSlot(int,int))); + connect(m_CompleteView, TQ_SIGNAL(zoomRectMoved(int,int)), + this, TQ_SLOT(zoomRectMoved(int,int))); + connect(m_CompleteView, TQ_SIGNAL(zoomRectMoveFinished()), + this, TQ_SLOT(zoomRectMoveFinished())); m_LastAutoPosition = TopLeft; _isMoving = false; _noUpdateZoomerPos = false; @@ -495,9 +495,9 @@ void RevGraphView::dumpRevtree() renderProcess->setEnvironment("LANG","C"); *renderProcess << "dot"; *renderProcess << dotTmpFile->name() << "-Tplain"; - connect(renderProcess,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(dotExit(TDEProcess*))); - connect(renderProcess,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this,TQT_SLOT(readDotOutput(TDEProcess*,char*,int)) ); + connect(renderProcess,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(dotExit(TDEProcess*))); + connect(renderProcess,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this,TQ_SLOT(readDotOutput(TDEProcess*,char*,int)) ); if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) { TQString arguments; for (unsigned c=0;c<renderProcess->args().count();++c) { @@ -735,7 +735,7 @@ void RevGraphView::makeSelected(GraphTreeLabel*gtl) void RevGraphView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { setFocus(); - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { TQCanvasItemList l = canvas()->collisions(e->pos()); if (l.count()>0) { TQCanvasItem* i = l.first(); @@ -901,7 +901,7 @@ void RevGraphView::makeCat(GraphTreeLabel*_l) } svn::Revision tr(it.data().rev); TQString tp = _basePath+it.data().name; - emit makeCat(tr,tp,it.data().name,tr,TQT_TQWIDGET(kapp->activeModalWidget())); + emit makeCat(tr,tp,it.data().name,tr,kapp->activeModalWidget()); } void RevGraphView::makeDiffPrev(GraphTreeLabel*_l) @@ -931,9 +931,9 @@ void RevGraphView::makeDiff(const TQString&n1,const TQString&n2) svn::Revision tr(it.data().rev); TQString tp = _basePath+it.data().name; if (Kdesvnsettings::tree_diff_rec()) { - emit makeRecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget())); + emit makeRecDiff(sp,sr,tp,tr,kapp->activeModalWidget()); } else { - emit makeNorecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget())); + emit makeNorecDiff(sp,sr,tp,tr,kapp->activeModalWidget()); } } @@ -944,7 +944,7 @@ void RevGraphView::setBasePath(const TQString&_path) void RevGraphView::slotClientException(const TQString&what) { - KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error")); + KMessageBox::sorry(TDEApplication::activeModalWidget(),what,i18n("SVN Error")); } #include "revgraphview.moc" diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h index d8d1972..9e9b577 100644 --- a/src/svnfrontend/graphtree/revgraphview.h +++ b/src/svnfrontend/graphtree/revgraphview.h @@ -20,7 +20,7 @@ #ifndef REVGRAPHVIEW_H #define REVGRAPHVIEW_H -#include <svnqt/revision.hpp> +#include <svnqt/revision.h> #include <tqcanvas.h> @@ -43,7 +43,7 @@ class CContextListener; */ class RevGraphView : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto }; diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index be11aa2..c37818f 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include "revisiontree.h" #include "stopdlg.h" -#include "log_entry.hpp" -#include "LogCache.hpp" -#include "ReposLog.hpp" -#include "url.hpp" +#include "log_entry.h" +#include "LogCache.h" +#include "ReposLog.h" +#include "url.h" #include "sub2qt.h" #include "revtreewidget.h" #include "revgraphview.h" diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h index 199929d..211e3d4 100644 --- a/src/svnfrontend/graphtree/revisiontree.h +++ b/src/svnfrontend/graphtree/revisiontree.h @@ -20,9 +20,9 @@ #ifndef REVISIONTREE_H #define REVISIONTREE_H -#include "log_entry.hpp" -#include "revision.hpp" -#include "client.hpp" +#include "log_entry.h" +#include "revision.h" +#include "client.h" #include <tqstring.h> #include <tqmap.h> diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp index 46ae7fa..ff1fb5a 100644 --- a/src/svnfrontend/graphtree/revtreewidget.cpp +++ b/src/svnfrontend/graphtree/revtreewidget.cpp @@ -41,25 +41,25 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const RevTreeWidgetLayout = new TQVBoxLayout( this, 11, 6, "RevTreeWidgetLayout"); m_Splitter = new TQSplitter( this, "m_Splitter" ); - m_Splitter->setOrientation( Qt::Vertical ); + m_Splitter->setOrientation( TQt::Vertical ); m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" ); m_RevGraphView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); - connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&))); + connect(m_RevGraphView,TQ_SIGNAL(dispDetails(const TQString&)),this,TQ_SLOT(setDetailText(const TQString&))); connect(m_RevGraphView, - TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this, - TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) + TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect(m_RevGraphView, - TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this, - TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) + TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect(m_RevGraphView, - TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)), + TQ_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)), this, - TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)) + TQ_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)) ); m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" ); diff --git a/src/svnfrontend/graphtree/revtreewidget.h b/src/svnfrontend/graphtree/revtreewidget.h index 40a1b10..cecda25 100644 --- a/src/svnfrontend/graphtree/revtreewidget.h +++ b/src/svnfrontend/graphtree/revtreewidget.h @@ -20,7 +20,7 @@ #ifndef REVTREEWIDGET_H #define REVTREEWIDGET_H -#include <svnqt/revision.hpp> +#include <svnqt/revision.h> #include <tqvariant.h> #include <tqpixmap.h> @@ -42,7 +42,7 @@ namespace svn { class RevTreeWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui index 47c7052..c144100 100644 --- a/src/svnfrontend/hotcopydlg.ui +++ b/src/svnfrontend/hotcopydlg.ui @@ -71,9 +71,6 @@ <property name="text"> <string>Clean logs</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> diff --git a/src/svnfrontend/hotcopydlg_impl.h b/src/svnfrontend/hotcopydlg_impl.h index 5e216c5..7d2857f 100644 --- a/src/svnfrontend/hotcopydlg_impl.h +++ b/src/svnfrontend/hotcopydlg_impl.h @@ -23,7 +23,7 @@ #include "hotcopydlg.h" class HotcopyDlg_impl: public HotcopyDlg { -Q_OBJECT +TQ_OBJECT public: HotcopyDlg_impl(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp index 8dfd03e..ecf8e47 100644 --- a/src/svnfrontend/importdir_logmsg.cpp +++ b/src/svnfrontend/importdir_logmsg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "importdir_logmsg.h" -#include "version_check.hpp" +#include "version_check.h" #include <tdelocale.h> diff --git a/src/svnfrontend/importdir_logmsg.h b/src/svnfrontend/importdir_logmsg.h index c6b2b18..e07f4ae 100644 --- a/src/svnfrontend/importdir_logmsg.h +++ b/src/svnfrontend/importdir_logmsg.h @@ -28,7 +28,7 @@ class TQCheckBox; */ class Importdir_logmsg : public Logmsg_impl { -Q_OBJECT +TQ_OBJECT public: Importdir_logmsg(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp index 1d60730..0e47316 100644 --- a/src/svnfrontend/itemdisplay.cpp +++ b/src/svnfrontend/itemdisplay.cpp @@ -21,7 +21,7 @@ #include "itemdisplay.h" #include "svnitem.h" #include "tdesvnsettings.h" -#include "status.hpp" +#include "status.h" ItemDisplay::ItemDisplay() diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h index 2c3ffbc..7bb2fa0 100644 --- a/src/svnfrontend/itemdisplay.h +++ b/src/svnfrontend/itemdisplay.h @@ -21,7 +21,7 @@ #ifndef __ITEMDISPLAY_H #define __ITEMDISPLAY_H -#include "svnqttypes.hpp" +#include "svnqttypes.h" #include <tqptrlist.h> #include <tqstring.h> #include <kurl.h> diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui index 70a947b..2f140b5 100644 --- a/src/svnfrontend/loaddmpdlg.ui +++ b/src/svnfrontend/loaddmpdlg.ui @@ -113,9 +113,6 @@ <property name="text"> <string>Default</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -127,9 +124,6 @@ <property name="text"> <string>Ignore</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -138,9 +132,6 @@ <property name="text"> <string>Force</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> @@ -151,9 +142,6 @@ <property name="text"> <string>Use pre-commit hook</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox"> <property name="name"> @@ -162,9 +150,6 @@ <property name="text"> <string>Use post-commit hook</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> diff --git a/src/svnfrontend/loaddmpdlg_impl.h b/src/svnfrontend/loaddmpdlg_impl.h index 8a31eb5..f20f373 100644 --- a/src/svnfrontend/loaddmpdlg_impl.h +++ b/src/svnfrontend/loaddmpdlg_impl.h @@ -23,7 +23,7 @@ #include "loaddmpdlg.h" class LoadDmpDlg_impl: public LoadDmpDlg { -Q_OBJECT +TQ_OBJECT public: LoadDmpDlg_impl(TQWidget *parent = 0, const char *name = 0); diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui index 621ecd0..94c0fcf 100644 --- a/src/svnfrontend/merge_dlg.ui +++ b/src/svnfrontend/merge_dlg.ui @@ -100,9 +100,6 @@ <property name="text"> <string>Force delete on modified/unversioned</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="1" column="0"> <property name="name"> @@ -119,9 +116,6 @@ <property name="text"> <string>Just dry run without modifications</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="0" column="0"> <property name="name"> @@ -130,9 +124,6 @@ <property name="text"> <string>Recursive</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -194,9 +185,9 @@ <slot>externDisplayToggled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">externDisplayToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="2" margin="2"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index c8efc54..b046043 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "mergedlg_impl.h" #include "rangeinput_impl.h" -#include "svnqt/url.hpp" +#include "svnqt/url.h" #include "ktranslateurl.h" #include "tdesvnsettings.h" diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h index e6e702d..d070fc9 100644 --- a/src/svnfrontend/mergedlg_impl.h +++ b/src/svnfrontend/mergedlg_impl.h @@ -24,7 +24,7 @@ #include "rangeinput_impl.h" class MergeDlg_impl: public MergeDlg { -Q_OBJECT +TQ_OBJECT public: MergeDlg_impl(TQWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true); diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp index 8cef421..ca185b5 100644 --- a/src/svnfrontend/modifiedthread.cpp +++ b/src/svnfrontend/modifiedthread.cpp @@ -21,7 +21,7 @@ #include "modifiedthread.h" #include "tcontextlistener.h" -#include "svnqttypes.hpp" +#include "svnqttypes.h" #include <tqobject.h> #include <kdebug.h> @@ -33,7 +33,7 @@ CheckModifiedThread::CheckModifiedThread(TQObject*_parent,const TQString&what,bo m_Parent = _parent; m_CurrentContext = new svn::Context(); m_ContextListener = new ThreadContextListener(m_Parent); - TQObject::connect(m_ContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); + TQObject::connect(m_ContextListener,TQ_SIGNAL(sendNotify(const TQString&)),m_Parent,TQ_SLOT(slotNotifyMessage(const TQString&))); m_CurrentContext->setListener(m_ContextListener); m_what = what; diff --git a/src/svnfrontend/modifiedthread.h b/src/svnfrontend/modifiedthread.h index 93beb33..af6d7dd 100644 --- a/src/svnfrontend/modifiedthread.h +++ b/src/svnfrontend/modifiedthread.h @@ -20,9 +20,9 @@ #ifndef _MODIFIED_THREAD_H #define _MODIFIED_THREAD_H -#include "client.hpp" -#include "revision.hpp" -#include "status.hpp" +#include "client.h" +#include "revision.h" +#include "status.h" #include "ccontextlistener.h" #include "eventnumbers.h" #include "frontendtypes.h" diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index aa9d090..b30956e 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -47,7 +47,7 @@ void OpenContextmenu::setup() TQString actionName( (*it)->name().replace("&", "&&") ); act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), nam.prepend( "appservice_" ) ); + this, TQ_SLOT( slotRunService() ), this, nam.prepend( "appservice_" ) ); act->plug(this); m_mapPopup[ id++ ] = *it; } @@ -55,13 +55,13 @@ void OpenContextmenu::setup() insertSeparator( ); } act = new TDEAction(i18n("Other..."),0, 0, - TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ),TQT_TQOBJECT(this),"openwith"); + this, TQ_SLOT( slotOpenWith() ),this,"openwith"); act->plug(this); } void OpenContextmenu::slotRunService() { - TQCString senderName = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQCString senderName = sender()->name(); int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt(); TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id ); diff --git a/src/svnfrontend/opencontextmenu.h b/src/svnfrontend/opencontextmenu.h index d0b32af..b48a7a8 100644 --- a/src/svnfrontend/opencontextmenu.h +++ b/src/svnfrontend/opencontextmenu.h @@ -31,7 +31,7 @@ */ class OpenContextmenu : public TQPopupMenu { -Q_OBJECT +TQ_OBJECT public: OpenContextmenu(const KURL&,const TDETrader::OfferList&,TQWidget* parent, const char* name); diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index b4f8b7e..45b74b3 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -23,7 +23,7 @@ #include "propertiesdlg.h" #include "editproperty_impl.h" #include "svnitem.h" -#include "client.hpp" +#include "client.h" #include <tqvariant.h> #include <tqlabel.h> @@ -85,12 +85,12 @@ PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revi clearWState( WState_Polished ); // signals and slots connections - connect( m_AddButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); - connect( m_ModifyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModify())); - connect( m_DeleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete())); - connect(this,TQT_SIGNAL(helpClicked()),TQT_SLOT(slotHelp())); - connect(m_PropertiesListview,TQT_SIGNAL(selectionChanged(TQListViewItem*)),this,TQT_SLOT(slotSelectionChanged(TQListViewItem*))); -// connect(m_PropertiesListview,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotSelectionExecuted(TQListViewItem*))); + connect( m_AddButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd())); + connect( m_ModifyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModify())); + connect( m_DeleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete())); + connect(this,TQ_SIGNAL(helpClicked()),TQ_SLOT(slotHelp())); + connect(m_PropertiesListview,TQ_SIGNAL(selectionChanged(TQListViewItem*)),this,TQ_SLOT(slotSelectionChanged(TQListViewItem*))); +// connect(m_PropertiesListview,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotSelectionExecuted(TQListViewItem*))); if (!m_Client) { m_PropertiesListview->setEnabled(false); diff --git a/src/svnfrontend/propertiesdlg.h b/src/svnfrontend/propertiesdlg.h index b67288d..fc0d289 100644 --- a/src/svnfrontend/propertiesdlg.h +++ b/src/svnfrontend/propertiesdlg.h @@ -26,8 +26,8 @@ #include <tqmap.h> #include <tqstring.h> -#include "svnqttypes.hpp" -#include "revision.hpp" +#include "svnqttypes.h" +#include "revision.h" class TQVBoxLayout; class TQHBoxLayout; @@ -46,7 +46,7 @@ namespace svn { class PropertiesDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 8c6077d..bae5967 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -62,13 +62,13 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt mWait = false; m_LogWindow = 0; - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); if (m_Context) { - connect(m_Context,TQT_SIGNAL(tickProgress()),this,TQT_SLOT(slotTick())); - connect(m_Context,TQT_SIGNAL(waitShow(bool)),this,TQT_SLOT(slotWait(bool))); - connect(m_Context,TQT_SIGNAL(netProgress(long long int, long long int)), - this,TQT_SLOT(slotNetProgres(long long int, long long int))); - connect(this,TQT_SIGNAL(sigCancel(bool)),m_Context,TQT_SLOT(setCanceled(bool))); + connect(m_Context,TQ_SIGNAL(tickProgress()),this,TQ_SLOT(slotTick())); + connect(m_Context,TQ_SIGNAL(waitShow(bool)),this,TQ_SLOT(slotWait(bool))); + connect(m_Context,TQ_SIGNAL(netProgress(long long int, long long int)), + this,TQ_SLOT(slotNetProgres(long long int, long long int))); + connect(this,TQ_SIGNAL(sigCancel(bool)),m_Context,TQ_SLOT(setCanceled(bool))); } mShowTimer->start(m_MinDuration, true); setMinimumSize(280,160); @@ -102,7 +102,7 @@ StopDlg::~StopDlg() void StopDlg::slotAutoShow() { bool hasDialogs = false; - TQWidget * w = TQT_TQWIDGET(kapp->activeModalWidget()); + TQWidget * w = kapp->activeModalWidget(); if (w && w!=this && w!=parentWidget() ) { hasDialogs = true; } @@ -200,7 +200,7 @@ void StopDlg::slotNetProgres(long long int current, long long int max) StopSimpleDlg::StopSimpleDlg(TQWidget *parent, const char *name,const TQString&caption,const TQString&text) : StopDlg(0,parent,name,caption,text),cancelld(false) { - connect(this,TQT_SIGNAL(sigCancel(bool)),this,TQT_SLOT(slotSimpleCancel(bool))); + connect(this,TQ_SIGNAL(sigCancel(bool)),this,TQ_SLOT(slotSimpleCancel(bool))); } void StopSimpleDlg::slotSimpleCancel(bool how) diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h index 0aaa948..fbddd8e 100644 --- a/src/svnfrontend/stopdlg.h +++ b/src/svnfrontend/stopdlg.h @@ -40,7 +40,7 @@ class TQVBoxLayout; */ class StopDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: StopDlg(TQObject*,TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); @@ -86,7 +86,7 @@ signals: class StopSimpleDlg:public StopDlg { - Q_OBJECT + TQ_OBJECT public: StopSimpleDlg(TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 9171a00..037c212 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -37,17 +37,17 @@ #include "revisiontree.h" #include "tdesvnsettings.h" #include "tdesvn_events.h" -#include "client.hpp" -#include "annotate_line.hpp" -#include "context_listener.hpp" -#include "dirent.hpp" -#include "targets.hpp" -#include "url.hpp" -#include "wc.hpp" -#include "svnqt_defines.hpp" -#include "LogCache.hpp" -#include "ReposLog.hpp" -#include "url.hpp" +#include "client.h" +#include "annotate_line.h" +#include "context_listener.h" +#include "dirent.h" +#include "targets.h" +#include "url.h" +#include "wc.h" +#include "svnqt_defines.h" +#include "LogCache.h" +#include "ReposLog.h" +#include "url.h" #include "helpers/sub2qt.h" #include "fronthelpers/cursorstack.h" @@ -209,9 +209,9 @@ SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_bloc m_Data->m_ParentList = parent; m_Data->m_SvnContextListener = new CContextListener(this); m_Data->runblocked = processes_blocked; - connect(m_Data->m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); - connect(&(m_Data->m_ThreadCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkModthread())); - connect(&(m_Data->m_UpdateCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdateThread())); + connect(m_Data->m_SvnContextListener,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&))); + connect(&(m_Data->m_ThreadCheckTimer),TQ_SIGNAL(timeout()),this,TQ_SLOT(checkModthread())); + connect(&(m_Data->m_UpdateCheckTimer),TQ_SIGNAL(timeout()),this,TQ_SLOT(checkUpdateThread())); } svn::Client* SvnActions::svnclient() @@ -252,7 +252,7 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h buttons = buttons|KDialogBase::User1; } KDialogBase * dlg = new KDialogBase( - modal?TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())):0, // parent + modal?TDEApplication::activeModalWidget():0, // parent name, // name modal, // modal _head, // caption @@ -291,7 +291,7 @@ svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&st try { StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs", i18n("Getting logs - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (doNetworking()) { m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit); } else { @@ -454,15 +454,15 @@ void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn disp = rt.getView(); if (disp) { connect( - disp,TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), - this,TQT_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) + disp,TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQ_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect( - disp,TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), - this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) + disp,TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); - connect(disp,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), - this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); + connect(disp,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQ_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg")); dlg.exec(); dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg",false); @@ -483,13 +483,13 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const kdDebug()<<"getting logs..."<<endl; svn::SharedPointer<svn::LogEntriesMap> logs = getLog(start,end,peg,which,list_files,limit); if (!logs) return; - bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0; + bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0; if (need_modal||!m_Data->m_LogDialog) { m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal); - connect(m_Data->m_LogDialog,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), - this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); - connect(m_Data->m_LogDialog,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), - this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); + connect(m_Data->m_LogDialog,TQ_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); + connect(m_Data->m_LogDialog,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQ_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); } if (m_Data->m_LogDialog) { @@ -528,7 +528,7 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co try { CursorStack a(TQt::BusyCursor); StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->annotate(blame,p,start,end,peg); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -554,7 +554,7 @@ bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const T try { StopDlg sdlg(m_Data->m_SvnContextListener,dlgp, 0,"Content get",i18n("Getting content - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->get(p,target,start,peg); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -673,7 +673,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Details", i18n("Retrieving infos - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); svn::InfoEntries e; entries = (m_Data->m_Svnclient->info(_what+ (_what.find("@")>-1&&!svn::Url::isValid(_what)?"@BASE":""),recursive?svn::DepthInfinity:svn::DepthEmpty,rev,peg)); @@ -865,7 +865,7 @@ void SvnActions::slotProperties() if (!k) return; PropertiesDlg dlg(k,svnclient(), m_Data->m_ParentList->isWorkingCopy()?svn::Revision::WORKING:svn::Revision::HEAD); - connect(&dlg,TQT_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQT_SLOT(slotClientException(const TQString&))); + connect(&dlg,TQ_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQ_SLOT(slotClientException(const TQString&))); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()), "properties_dlg")); if (dlg.exec()!=TQDialog::Accepted) { return; @@ -884,7 +884,7 @@ bool SvnActions::changeProperties(const svn::PropertiesMap&setList,const TQValue { try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Applying properties","<center>Applying<br>hit cancel for abort</center>"); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); unsigned int pos; for (pos = 0; pos<delList.size();++pos) { m_Data->m_Svnclient->propdel(delList[pos],svn::Path(path)); @@ -1024,7 +1024,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Commiting"), i18n("Commiting - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); nnum = m_Data->m_Svnclient->commit(_targets,msg,depth,keeplocks); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1085,7 +1085,7 @@ bool SvnActions::get(const TQString&what,const TQString& to,const svn::Revision& try { StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),0,"Downloading", i18n("Download - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->get(svn::Path(what), to,rev,_peg); } catch (const svn::Exception&e) { @@ -1193,9 +1193,9 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co *proc << *it; } } - connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); - connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*))); + connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) { if (!m_Data->runblocked) { if (!isDir) { @@ -1249,7 +1249,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const try { StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing", i18n("Diffing - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (p1==p2 && (r1.isRemote()||r2.isRemote())) { kdDebug()<<"Pegged diff"<<endl; ex = m_Data->m_Svnclient->diff_peg(svn::Path(tn), @@ -1300,7 +1300,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ bool ignore_content = Kdesvnsettings::diff_ignore_content(); try { StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort"); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); ex = m_Data->m_Svnclient->diff(svn::Path(tn), svn::Path(p1),svn::Path(p2),svn::Path(), r1, r2, @@ -1342,10 +1342,10 @@ void SvnActions::dispDiff(const TQByteArray&ex) } } - connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*))); + connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); if (!fname_used) { - connect(proc,TQT_SIGNAL(wroteStdin(TDEProcess*)),this,TQT_SLOT(wroteStdin(TDEProcess*))); + connect(proc,TQ_SIGNAL(wroteStdin(TDEProcess*)),this,TQ_SLOT(wroteStdin(TDEProcess*))); } if (proc->start(TDEProcess::NotifyOnExit,fname_used?TDEProcess::Stderr:(TDEProcess::Communication)r)) { if (!fname_used) proc->writeStdin(ex,ex.size()); @@ -1356,7 +1356,7 @@ void SvnActions::dispDiff(const TQByteArray&ex) } delete proc; } - bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0; + bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0; if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) { DiffBrowser*ptr; @@ -1370,10 +1370,10 @@ void SvnActions::dispDiff(const TQByteArray&ex) TQWidget*wd = dlg->mainWidget(); if (wd) { EncodingSelector_impl * ls = new EncodingSelector_impl("",wd); - TQObject::connect(ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), - ptr,TQT_SLOT(slotTextCodecChanged(const TQString&))); + TQObject::connect(ls,TQ_SIGNAL(TextCodecChanged(const TQString&)), + ptr,TQ_SLOT(slotTextCodecChanged(const TQString&))); } - TQObject::connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(saveDiff())); + TQObject::connect(dlg,TQ_SIGNAL(user1Clicked()),ptr,TQ_SLOT(saveDiff())); ptr->setText(ex); if (need_modal) { ptr->setFocus(); @@ -1409,7 +1409,7 @@ void SvnActions::makeUpdate(const TQStringList&what,const svn::Revision&rev,bool try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Making update", i18n("Making update - hit cancel for abort")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); svn::Targets pathes(what); ret = m_Data->m_Svnclient->update(pathes,rev, recurse?svn::DepthInfinity:svn::DepthFiles,false,false,true); } catch (const svn::Exception&e) { @@ -1689,7 +1689,7 @@ bool SvnActions::makeCheckout(const TQString&rUrl,const TQString&tPath,const svn if (!_exp||!m_Data->m_CurrentContext) reInitClient(); try { StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (_exp) { /// @todo setup parameter for export operation m_Data->m_Svnclient->doExport(svn::Path(fUrl),p,r,peg,overwrite,TQString(),ignoreExternal,depth); @@ -1762,7 +1762,7 @@ void SvnActions::slotRevertItems(const TQStringList&displist) try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Revert"),i18n("Reverting items")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); svn::Targets target(items); m_Data->m_Svnclient->revert(target,depth); } catch (const svn::Exception&e) { @@ -1788,7 +1788,7 @@ bool SvnActions::makeSwitch(const TQString&rUrl,const TQString&tPath,const svn:: svn::Path p(tPath); try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Switch url"),i18n("Switching url")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->doSwitch(p,fUrl,r,depth,peg,stickydepth,ignore_externals,allow_unversioned); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1813,7 +1813,7 @@ bool SvnActions::makeRelocate(const TQString&fUrl,const TQString&tUrl,const TQSt svn::Path p(path); try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Relocate url"),i18n("Relocate repository to new URL")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->relocate(p,_f,_t,rec); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1875,7 +1875,7 @@ bool SvnActions::makeCleanup(const TQString&path) if (!m_Data->m_CurrentContext) return false; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Cleanup"),i18n("Cleaning up folder")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->cleanup(svn::Path(path)); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1889,7 +1889,7 @@ void SvnActions::slotResolved(const TQString&path) if (!m_Data->m_CurrentContext) return; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Resolve"),i18n("Marking resolved")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->resolve(svn::Path(path),svn::DepthEmpty); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1938,9 +1938,9 @@ void SvnActions::slotResolve(const TQString&p) *proc << *it; } } - connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); - connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*))); + connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) { return; } else { @@ -1956,7 +1956,7 @@ void SvnActions::slotImport(const TQString&path,const TQString&target,const TQSt if (!m_Data->m_CurrentContext) return; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Import"),i18n("Importing items")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->import(svn::Path(path),target,message,depth,noIgnore,noUnknown); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -2088,8 +2088,8 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co *proc << *it; } } - connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*))); + connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) { if (!m_Data->runblocked) { tdir1.setAutoDelete(false); @@ -2147,7 +2147,7 @@ void SvnActions::slotMerge(const TQString&src1,const TQString&src2, const TQStri } try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Merge"),i18n("Merging items")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); if (pegged_merge) { m_Data->m_Svnclient->merge_peg(p1,ranges,svn::Revision::HEAD,svn::Path(target),rec?svn::DepthUnknown:svn::DepthFiles, ancestry,dry,forceIt,false); @@ -2171,7 +2171,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force) svn::Revision nnum; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving/Rename item ")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); nnum = m_Data->m_Svnclient->move(svn::Path(Old),svn::Path(New),force); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -2189,7 +2189,7 @@ bool SvnActions::makeMove(const KURL::List&Old,const TQString&New,bool force) svn::Revision nnum; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving entries")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); KURL::List::ConstIterator it = Old.begin(); bool local = false; @@ -2216,7 +2216,7 @@ bool SvnActions::makeCopy(const TQString&Old,const TQString&New,const svn::Revis if (!m_Data->m_CurrentContext) return false; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->copy(svn::Path(Old),rev,svn::Path(New)); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -2241,7 +2241,7 @@ bool SvnActions::makeCopy(const KURL::List&Old,const TQString&New,const svn::Rev try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); KURL::List::ConstIterator it = Old.begin(); m_Data->m_Svnclient->copy(t,rev,rev,svn::Path(New),true); } catch (const svn::Exception&e) { @@ -2310,7 +2310,7 @@ bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn:: svn::Depth _d=rec?svn::DepthInfinity:svn::DepthImmediates; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status")); - connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); + connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&))); // rec all up noign dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false); } catch (const svn::Exception&e) { diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index 4342ea5..f5a79e0 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -20,11 +20,11 @@ #ifndef SVNACTIONS_H #define SVNACTIONS_H -#include "client.hpp" -#include "revision.hpp" -#include "smart_pointer.hpp" -#include "shared_pointer.hpp" -#include "svnqttypes.hpp" +#include "client.h" +#include "revision.h" +#include "smart_pointer.h" +#include "shared_pointer.h" +#include "svnqttypes.h" #include "simple_logcb.h" @@ -62,7 +62,7 @@ namespace TDEIO { */ class SvnActions : public TQObject,public SimpleLogCb { - Q_OBJECT + TQ_OBJECT public: enum ThreadType { diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index 462a32e..f9e66b5 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -113,7 +113,7 @@ void SvnFileTip::setItem(SvnItem*item, const TQRect &rect, const TQPixmap *pixma // Don't start immediately, because the user could move the mouse over another item // This avoids a quick sequence of started preview-jobs m_timer->disconnect( this ); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed())); m_timer->start( 300, true ); } else { m_timer->stop(); @@ -239,7 +239,7 @@ void SvnFileTip::showTip() if ( text.isEmpty() ) return; m_timer->disconnect( this ); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip())); m_timer->start( 15000, true ); m_textLabel->setText( text ); @@ -269,14 +269,14 @@ void SvnFileTip::startDelayed() oneItem.append( m_svnitem->fileItem() ); m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); - connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), - this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( gotPreviewResult() ) ); + connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), + this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); + connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( gotPreviewResult() ) ); } m_timer->disconnect( this ); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip())); m_timer->start( 400, true ); } diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index 2b71b2d..65486cc 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -39,7 +39,7 @@ class SvnItem; */ class SvnFileTip : public TQFrame { -Q_OBJECT +TQ_OBJECT public: SvnFileTip(TQScrollView*parent); diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index 0e70cbf..bfe5b8b 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -22,9 +22,9 @@ #include "svnactions.h" #include "tdesvn_part.h" #include "tdesvnsettings.h" -#include "status.hpp" -#include "smart_pointer.hpp" -#include "url.hpp" +#include "status.h" +#include "smart_pointer.h" +#include "url.h" #include "sub2qt.h" #include "ktranslateurl.h" diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h index 76c2533..73b7c9a 100644 --- a/src/svnfrontend/svnitem.h +++ b/src/svnfrontend/svnitem.h @@ -21,8 +21,8 @@ #ifndef __SVN_ITEM_H #define __SVN_ITEM_H -#include "smart_pointer.hpp" -#include "svnqttypes.hpp" +#include "smart_pointer.h" +#include "svnqttypes.h" #include <kmimetype.h> #include <tqstring.h> #include <tqdatetime.h> diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui index b55f2ec..d893f0b 100644 --- a/src/svnfrontend/svnlogdlg.ui +++ b/src/svnfrontend/svnlogdlg.ui @@ -262,9 +262,6 @@ <property name="text"> <string>Diff previous</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -276,9 +273,6 @@ <property name="text"> <string>Diff revisions</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Select second revision with right mouse button</string> </property> @@ -293,9 +287,6 @@ <property name="text"> <string>List entries</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -307,9 +298,6 @@ <property name="text"> <string>Annotate</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <spacer> <property name="name"> @@ -335,9 +323,6 @@ <property name="text"> <string>Close</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </hbox> </widget> @@ -448,7 +433,7 @@ <slot>slotGetLogs()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotSelectionChanged(TQListViewItem*)</slot> <slot access="protected">slotItemChanged(TQListViewItem*)</slot> <slot access="protected">slotDispPrevious()</slot> @@ -461,7 +446,7 @@ <slot access="protected">slotSingleDoubleClicked(TQListViewItem*)</slot> <slot access="protected">slotRevisionSelected()</slot> <slot access="protected">slotGetLogs()</slot> -</Q_SLOTS> +</slots> <forwards> <forward>class TQListViewItem;</forward> </forwards> diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index 5f8b69a..00f5959 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "svnlogdlgimp.h" #include "tdesvnsettings.h" -#include "log_entry.hpp" +#include "log_entry.h" #include "sub2qt.h" #include "svnactions.h" #include "revisionbuttonimpl.h" @@ -580,7 +580,7 @@ void SvnLogDlgImp::slotBlameItem() return; } svn::Revision start(svn::Revision::START); - m_Actions->makeBlame(start,k->rev(),_base+k->realName(),TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this); + m_Actions->makeBlame(start,k->rev(),_base+k->realName(),kapp->activeModalWidget(),k->rev(),this); } void SvnLogDlgImp::slotEntriesSelectionChanged() @@ -618,7 +618,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in { case 101: { - m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this); + m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this); break; } case 102: @@ -628,7 +628,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in } case 103: { - emit makeCat(k->rev(),_base+source,source,k->rev(),TQT_TQWIDGET(kapp->activeModalWidget())); + emit makeCat(k->rev(),_base+source,source,k->rev(),kapp->activeModalWidget()); } default: break; @@ -654,7 +654,7 @@ void SvnLogDlgImp::slotSingleDoubleClicked(TQListViewItem*_item) //svn_revnum_t prev = item->revision()>0?item->revision():k->rev()-1; svn::Revision start(svn::Revision::START); if (action != "D") { - m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this); + m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this); } } diff --git a/src/svnfrontend/svnlogdlgimp.h b/src/svnfrontend/svnlogdlgimp.h index 64b57c9..dbbffb3 100644 --- a/src/svnfrontend/svnlogdlgimp.h +++ b/src/svnfrontend/svnlogdlgimp.h @@ -22,9 +22,9 @@ #include "svnlogdlg.h" #include "simple_logcb.h" -#include "log_entry.hpp" -#include "client.hpp" -#include "shared_pointer.hpp" +#include "log_entry.h" +#include "client.h" +#include "shared_pointer.h" #include <tqsize.h> #include <tqregexp.h> @@ -34,7 +34,7 @@ class SvnActions; class SvnLogDlgImp: public SvnLogDialogData,public SimpleLogCb { -Q_OBJECT +TQ_OBJECT public: SvnLogDlgImp(SvnActions*,TQWidget *parent = 0, const char *name = 0,bool modal=true); diff --git a/src/svnfrontend/tcontextlistener.h b/src/svnfrontend/tcontextlistener.h index 9f0b258..097ce57 100644 --- a/src/svnfrontend/tcontextlistener.h +++ b/src/svnfrontend/tcontextlistener.h @@ -35,7 +35,7 @@ class ThreadContextListenerData; */ class ThreadContextListener : public CContextListener { - Q_OBJECT + TQ_OBJECT public: ThreadContextListener(TQObject* parent, const char* name=0); diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 21e23dc..d297e7d 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -31,11 +31,11 @@ #include "checkoutinfo_impl.h" #include "stopdlg.h" #include "tdesvnsettings.h" -#include "revision.hpp" -#include "dirent.hpp" -#include "client.hpp" -#include "status.hpp" -#include "url.hpp" +#include "revision.h" +#include "dirent.h" +#include "client.h" +#include "status.h" +#include "url.h" #include "sshagent.h" #include "sub2qt.h" #include "cursorstack.h" @@ -127,7 +127,7 @@ public: void connectDirTimer(TQObject*ob) { - TQObject::connect(&dirwatch_timer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_dirwatchTimeout())); + TQObject::connect(&dirwatch_timer,TQ_SIGNAL(timeout()),ob,TQ_SLOT(_dirwatchTimeout())); } void stopScan() { @@ -151,7 +151,7 @@ public: } void connectPropTimer(TQObject*ob) { - TQObject::connect(&propTimer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_propListTimeout())); + TQObject::connect(&propTimer,TQ_SIGNAL(timeout()),ob,TQ_SLOT(_propListTimeout())); } private: @@ -216,30 +216,30 @@ tdesvnfilelist::tdesvnfilelist(TDEActionCollection*aCollect,TQWidget *parent, co setSortColumn(FileListViewItem::COL_NAME); setupActions(); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, - TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, + TQ_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); /* not via executed 'cause click may used for selection - single click execution just confuses in an application */ - connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); - connect(this,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); - - connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); - connect(m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(slotClientException(const TQString&))); - connect(m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); - connect(m_SvnWrapper,TQT_SIGNAL(reinitItem(SvnItem*)),this,TQT_SLOT(slotReinitItem(SvnItem*))); - connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshAll()),this,TQT_SLOT(refreshCurrentTree())); - connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQT_SLOT(refreshCurrent(SvnItem*))); - connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshIcons(bool)),this,TQT_SLOT(slotRescanIcons(bool))); - connect(this,TQT_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)), - this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*))); - connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&))); - - connect(m_SvnWrapper,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG))); - connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions())); - - m_pList->connectDirTimer(TQT_TQOBJECT(this)); - m_pList->connectPropTimer(TQT_TQOBJECT(this)); + connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(this,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); + + connect(this,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged())); + connect(m_SvnWrapper,TQ_SIGNAL(clientException(const TQString&)),this,TQ_SLOT(slotClientException(const TQString&))); + connect(m_SvnWrapper,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&))); + connect(m_SvnWrapper,TQ_SIGNAL(reinitItem(SvnItem*)),this,TQ_SLOT(slotReinitItem(SvnItem*))); + connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshAll()),this,TQ_SLOT(refreshCurrentTree())); + connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQ_SLOT(refreshCurrent(SvnItem*))); + connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshIcons(bool)),this,TQ_SLOT(slotRescanIcons(bool))); + connect(this,TQ_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)), + this,TQ_SLOT(slotDropped(TQDropEvent*,TQListViewItem*))); + connect(m_SvnWrapper,TQ_SIGNAL(sigGotourl(const TQString&)),this,TQ_SLOT(_openURL(const TQString&))); + + connect(m_SvnWrapper,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG))); + connect(m_SvnWrapper,TQ_SIGNAL(sigThreadsChanged()),this,TQ_SLOT(enableActions())); + + m_pList->connectDirTimer(this); + m_pList->connectPropTimer(this); setDropHighlighter(true); setDragEnabled(true); @@ -259,152 +259,152 @@ void tdesvnfilelist::setupActions() TDEAction*tmp_action; /* local and remote actions */ /* 1. actions on dirs AND files */ - //new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); - new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); - new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); + //new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQ_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); + new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),this,TQ_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); + new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),this,TQ_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); new TDEAction(i18n("Partial revision tree"),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_T), - TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); + this,TQ_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); new TDEAction(i18n("Properties"),"edit", - TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property"); + TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQ_SLOT(slotProperties()),m_filesAction,"make_svn_property"); new TDEAction(i18n("Display Properties"),"edit", - TDEShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); + TDEShortcut(SHIFT+CTRL+Key_P),this,TQ_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); tmp_action = new TDEAction(i18n("Display last changes"),"tdesvndiff", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); + TDEShortcut(),this,TQ_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); tmp_action->setToolTip(i18n("Display last changes as difference to previous commit.")); m_InfoAction = new TDEAction(i18n("Details"),"tdesvninfo", - TDEShortcut(CTRL+Key_I),TQT_TQOBJECT(this),TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info"); + TDEShortcut(CTRL+Key_I),this,TQ_SLOT(slotInfo()),m_filesAction,"make_svn_info"); m_RenameAction = new TDEAction(i18n("Move"),"move", - TDEShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename"); + TDEShortcut(Key_F2),this,TQ_SLOT(slotRename()),m_filesAction,"make_svn_rename"); m_CopyAction = new TDEAction(i18n("Copy"),"tdesvncopy", - TDEShortcut(CTRL+Key_C),TQT_TQOBJECT(this),TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy"); - tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); + TDEShortcut(CTRL+Key_C),this,TQ_SLOT(slotCopy()),m_filesAction,"make_svn_copy"); + tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),this,TQ_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository")); /* 2. actions only on files */ m_BlameAction = new TDEAction(i18n("Blame"),"tdesvnblame", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame"); + TDEShortcut(),this,TQ_SLOT(slotBlame()),m_filesAction,"make_svn_blame"); m_BlameAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); m_BlameRangeAction = new TDEAction(i18n("Blame range"),"tdesvnblame", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); + TDEShortcut(),this,TQ_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); m_BlameRangeAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); m_CatAction = new TDEAction(i18n("Cat head"), "tdesvncat", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat"); + TDEShortcut(),this,TQ_SLOT(slotCat()),m_filesAction,"make_svn_cat"); m_CatAction->setToolTip(i18n("Output the content of specified files or URLs.")); tmp_action = new TDEAction(i18n("Cat revision..."),"tdesvncat", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); + TDEShortcut(),this,TQ_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); tmp_action->setToolTip(i18n("Output the content of specified files or URLs at specific revision.")); m_LockAction = new TDEAction(i18n("Lock current items"),"tdesvnlock", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock"); + TDEShortcut(),this,TQ_SLOT(slotLock()),m_filesAction,"make_svn_lock"); m_UnlockAction = new TDEAction(i18n("Unlock current items"),"tdesvnunlock", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); + TDEShortcut(),this,TQ_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); /* 3. actions only on dirs */ m_MkdirAction = new TDEAction(i18n("New folder"),"folder-new", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); + TDEShortcut(),this,TQ_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch", - TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); + TDEShortcut(), m_SvnWrapper,TQ_SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")")); tmp_action = new TDEAction(i18n("Relocate current working copy url"),"tdesvnrelocate",TDEShortcut(), - TQT_TQOBJECT(this),TQT_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); + this,TQ_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url")); tmp_action = new TDEAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",TDEShortcut(), - TQT_TQOBJECT(this),TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); + this,TQ_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted.")); m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"go-home",TDEShortcut(), - TQT_TQOBJECT(this),TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); + this,TQ_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from")); m_CleanupAction = new TDEAction(i18n("Cleanup"),"tdesvncleanup", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); + TDEShortcut(),this,TQ_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); m_CleanupAction->setToolTip(i18n("Recursively clean up the working copy, removing locks, resuming unfinished operations, etc.")); m_ImportDirsIntoCurrent = new TDEAction(i18n("Import folders into current"),"fileimport",TDEShortcut(), - TQT_TQOBJECT(this),TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); + this,TQ_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url")); /* local only actions */ /* 1. actions on files AND dirs*/ m_AddCurrent = new TDEAction(i18n("Add selected files/dirs"), - "tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add"); + "tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQ_SLOT(slotAdd()),m_filesAction,"make_svn_add"); m_AddCurrent->setToolTip(i18n("Adding selected files and/or directories to repository")); tmp_action = new TDEAction("Add selected files/dirs recursive", - "tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); + "tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQ_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders")); m_DelCurrent = new TDEAction(i18n("Delete selected files/dirs"),"tdesvndelete", - TDEShortcut(Key_Delete),TQT_TQOBJECT(this),TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove"); + TDEShortcut(Key_Delete),this,TQ_SLOT(slotDelete()),m_filesAction,"make_svn_remove"); m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository")); m_RevertAction = new TDEAction(i18n("Revert current changes"),"document-revert", - TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); + TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); m_ResolvedAction = new TDEAction(i18n("Mark resolved"),TDEShortcut(), - TQT_TQOBJECT(this),TQT_SLOT(slotResolved()),m_filesAction,"make_resolved"); + this,TQ_SLOT(slotResolved()),m_filesAction,"make_resolved"); m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved")); tmp_action = new TDEAction(i18n("Resolve conflicts"),TDEShortcut(), - TQT_TQOBJECT(this),TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); + this,TQ_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); - m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); + m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),this,TQ_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); m_UpdateHead = new TDEAction(i18n("Update to head"),"tdesvnupdate", - TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); + TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); m_UpdateRev = new TDEAction(i18n("Update to revision..."),"tdesvnupdate", - TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); + TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); m_commitAction = new TDEAction(i18n("Commit"),"tdesvncommit", - TDEShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); + TDEShortcut("CTRL+#"),m_SvnWrapper,TQ_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); tmp_action = new TDEAction(i18n("Diff local changes"),"tdesvndiff", - TDEShortcut(CTRL+Key_D),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); + TDEShortcut(CTRL+Key_D),this,TQ_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); tmp_action->setToolTip(i18n("Diff working copy against BASE (last checked out version) - doesn't require access to repository")); tmp_action = new TDEAction(i18n("Diff against HEAD"),"tdesvndiff", - TDEShortcut(CTRL+Key_H),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); + TDEShortcut(CTRL+Key_H),this,TQ_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); tmp_action->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository")); tmp_action = new TDEAction(i18n("Diff items"),"tdesvndiff", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); + TDEShortcut(),this,TQ_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); tmp_action->setToolTip(i18n("Diff two items")); m_MergeRevisionAction = new TDEAction(i18n("Merge two revisions"),"tdesvnmerge", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); + TDEShortcut(),this,TQ_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); m_MergeRevisionAction->setToolTip(i18n("Merge two revisions of this entry into itself")); tmp_action=new TDEAction(i18n("Merge..."),"tdesvnmerge", - TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge"); + TDEShortcut(),this,TQ_SLOT(slotMerge()),m_filesAction,"make_svn_merge"); tmp_action->setToolTip("Merge repository path into current worky copy path or current repository path into a target"); - tmp_action=new TDEAction( i18n( "Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" ); + tmp_action=new TDEAction( i18n( "Open With..." ), 0, this, TQ_SLOT( slotOpenWith() ), m_filesAction, "openwith" ); /* remote actions only */ m_CheckoutCurrentAction = new TDEAction(i18n("Checkout current repository path"),"tdesvncheckout",TDEShortcut(), - m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); + m_SvnWrapper,TQ_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); m_ExportCurrentAction = new TDEAction(i18n("Export current repository path"),"tdesvnexport",TDEShortcut(), - m_SvnWrapper,TQT_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); - new TDEAction(i18n("Select browse revision"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); + m_SvnWrapper,TQ_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); + new TDEAction(i18n("Select browse revision"),TDEShortcut(),this,TQ_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); /* independe actions */ m_CheckoutAction = new TDEAction(i18n("Checkout a repository"),"tdesvncheckout", - TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); + TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); m_ExportAction = new TDEAction(i18n("Export a repository"),"tdesvnexport", - TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export"); - m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),TQT_TQOBJECT(this),TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); + TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotExport()),m_filesAction,"make_svn_export"); + m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),this,TQ_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); - new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); + new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),this,TQ_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); /* folding options */ - tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, TQT_TQOBJECT(this) , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); + tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, this , TQ_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); tmp_action->setToolTip(i18n("Opens all branches of the file tree")); - tmp_action = new TDEAction( i18n("Fold File Tree"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); + tmp_action = new TDEAction( i18n("Fold File Tree"), 0, this, TQ_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); tmp_action->setToolTip(i18n("Closes all branches of the file tree")); /* caching */ - tmp_action = new TDEAction( i18n("Update log cache"),0,TQT_TQOBJECT(this),TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); + tmp_action = new TDEAction( i18n("Update log cache"),0,this,TQ_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); tmp_action->setToolTip(i18n("Update the log cache for current repository")); - /* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); + /* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQ_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); tmp_action->setToolTip(i18n("Stop the update of the log cache")); */ @@ -585,10 +585,10 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit ) } m_SvnWrapper->clearUpdateCache(); if (isWorkingCopy()) { - m_pList->m_DirWatch=new KDirWatch(TQT_TQOBJECT(this)); - connect(m_pList->m_DirWatch,TQT_SIGNAL(dirty(const TQString&)),this,TQT_SLOT(slotDirItemDirty(const TQString&))); - connect(m_pList->m_DirWatch,TQT_SIGNAL(created(const TQString&)),this,TQT_SLOT(slotDirItemCreated(const TQString&))); - connect(m_pList->m_DirWatch,TQT_SIGNAL(deleted(const TQString&)),this,TQT_SLOT(slotDirItemDeleted(const TQString&))); + m_pList->m_DirWatch=new KDirWatch(this); + connect(m_pList->m_DirWatch,TQ_SIGNAL(dirty(const TQString&)),this,TQ_SLOT(slotDirItemDirty(const TQString&))); + connect(m_pList->m_DirWatch,TQ_SIGNAL(created(const TQString&)),this,TQ_SLOT(slotDirItemCreated(const TQString&))); + connect(m_pList->m_DirWatch,TQ_SIGNAL(deleted(const TQString&)),this,TQ_SLOT(slotDirItemDeleted(const TQString&))); /* seems that recursive does not work */ if (m_pList->m_DirWatch) { m_pList->m_DirWatch->addDir(baseUri()+"/",false,false); @@ -620,7 +620,7 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit ) } emit changeCaption(baseUri()); emit sigUrlOpend(result); - TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); + TQTimer::singleShot(1,this,TQ_SLOT(readSupportData())); enableActions(); return result; } @@ -1041,7 +1041,7 @@ void tdesvnfilelist::slotSelectionChanged() void tdesvnfilelist::slotClientException(const TQString&what) { emit sigLogMessage(what); - KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error")); + KMessageBox::sorry(TDEApplication::activeModalWidget(),what,i18n("SVN Error")); } @@ -1067,7 +1067,7 @@ void tdesvnfilelist::slotChangeToRepository() return; } if (i.reposRoot().isEmpty()) { - KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); + KMessageBox::sorry(TDEApplication::activeModalWidget(),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); } else { sigSwitchUrl(i.reposRoot()); } @@ -1150,7 +1150,7 @@ template<class T> KDialogBase* tdesvnfilelist::createDialog(T**ptr,const TQStrin buttons = buttons|KDialogBase::Help; } KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())), + TDEApplication::activeModalWidget(), name, true, _head, @@ -1287,7 +1287,7 @@ void tdesvnfilelist::refreshCurrentTree() kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl; setUpdatesEnabled(true); viewport()->repaint(); - TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); + TQTimer::singleShot(1,this,TQ_SLOT(readSupportData())); //m_pList->startScan(); } @@ -1673,7 +1673,7 @@ void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) TDEListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { TQPainter painter(viewport()); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), + style().drawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), TQStyle::Style_FocusAtBorder); } } @@ -1815,7 +1815,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) //m_pList->stopScan(); TDEIO::Job * job = 0L; job = TDEIO::copy(urlList,tdir); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); dispDummy(); event->acceptAction(); return; @@ -1860,7 +1860,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) m_pList->intern_drop_target=tdir; m_pList->intern_drop_action=action; m_pList->intern_drop_pos=TQCursor::pos(); - TQTimer::singleShot(0,this,TQT_SLOT(slotInternalDrop())); + TQTimer::singleShot(0,this,TQ_SLOT(slotInternalDrop())); // internalDrop(action,urlList,tdir); } @@ -2005,7 +2005,7 @@ void tdesvnfilelist::slotDelete() } if (tdeioList.count()>0) { TDEIO::Job*aJob = TDEIO::del(tdeioList); - connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*))); + connect(aJob,TQ_SIGNAL(result (TDEIO::Job *)),this,TQ_SLOT(slotDeleteFinished(TDEIO::Job*))); dispDummy(); } if (m_deletePerfect && items.size()>0) { @@ -2716,7 +2716,7 @@ void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) m_pList->m_fileTip->setItem(0); TQPoint p(contentsToViewport( e->pos())); TQListViewItem *i = itemAt( p ); - // this is from qt the example - hopefully I got my problems with drag&drop fixed. + // this is from tqt the example - hopefully I got my problems with drag&drop fixed. if ( i ) { // if the user clicked into the root decoration of the item, don't try to start a drag! if ( p.x() > header()->cellPos( header()->mapToActual( 0 ) ) + @@ -3059,8 +3059,8 @@ void tdesvnfilelist::slotUnfoldTree() { StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder")); - connect(this,TQT_SIGNAL(sigListError()), - &sdlg,TQT_SLOT(makeCancel())); + connect(this,TQ_SIGNAL(sigListError()), + &sdlg,TQ_SLOT(makeCancel())); TQListViewItemIterator it(this); TQTime t;t.start(); diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h index 2337b20..f41c1cc 100644 --- a/src/svnfrontend/tdesvnfilelist.h +++ b/src/svnfrontend/tdesvnfilelist.h @@ -22,8 +22,8 @@ #include "itemdisplay.h" #include "filelistviewitem.h" -#include "status.hpp" -#include "client.hpp" +#include "status.h" +#include "client.h" #include <tdelistview.h> #include <kurl.h> @@ -52,7 +52,7 @@ namespace svn { */ class tdesvnfilelist : public TDEListView,public ItemDisplay { - Q_OBJECT + TQ_OBJECT friend class FileListViewItem; public: diff --git a/src/svnfrontend/threadcontextlistenerdata.h b/src/svnfrontend/threadcontextlistenerdata.h index 285817c..e8d50f6 100644 --- a/src/svnfrontend/threadcontextlistenerdata.h +++ b/src/svnfrontend/threadcontextlistenerdata.h @@ -20,7 +20,7 @@ #ifndef THREADCONTEXTLISTENERDATA_H #define THREADCONTEXTLISTENERDATA_H -#include "context_listener.hpp" +#include "context_listener.h" #include <tqthread.h> #include <tqstring.h> |