diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /parts/fileview | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/fileview')
-rw-r--r-- | parts/fileview/CMakeLists.txt | 10 | ||||
-rw-r--r-- | parts/fileview/Makefile.am | 20 | ||||
-rw-r--r-- | parts/fileview/filegroupsconfigwidget.cpp | 4 | ||||
-rw-r--r-- | parts/fileview/filegroupspart.cpp | 18 | ||||
-rw-r--r-- | parts/fileview/filegroupspart.h | 4 | ||||
-rw-r--r-- | parts/fileview/filegroupswidget.cpp | 18 | ||||
-rw-r--r-- | parts/fileview/filegroupswidget.h | 2 | ||||
-rw-r--r-- | parts/fileview/filetreeviewwidgetimpl.cpp | 6 | ||||
-rw-r--r-- | parts/fileview/filetreewidget.cpp | 18 | ||||
-rw-r--r-- | parts/fileview/filetreewidget.h | 14 | ||||
-rw-r--r-- | parts/fileview/fileviewpart.cpp | 26 | ||||
-rw-r--r-- | parts/fileview/fileviewpart.h | 8 | ||||
-rw-r--r-- | parts/fileview/kdevfilegroups.desktop (renamed from parts/fileview/tdevfilegroups.desktop) | 4 | ||||
-rw-r--r-- | parts/fileview/kdevfileview.desktop (renamed from parts/fileview/tdevfileview.desktop) | 4 | ||||
-rw-r--r-- | parts/fileview/partwidget.cpp | 10 | ||||
-rw-r--r-- | parts/fileview/vcsfiletreewidgetimpl.cpp | 16 | ||||
-rw-r--r-- | parts/fileview/vcsfiletreewidgetimpl.h | 8 |
17 files changed, 95 insertions, 95 deletions
diff --git a/parts/fileview/CMakeLists.txt b/parts/fileview/CMakeLists.txt index 49539df2..4f5f87dc 100644 --- a/parts/fileview/CMakeLists.txt +++ b/parts/fileview/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ install( FILES - tdevfileview.desktop tdevfilegroups.desktop + kdevfileview.desktop kdevfilegroups.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevfileview (module) ################## +##### libkdevfileview (module) ################## -tde_add_kpart( libtdevfileview AUTOMOC +tde_add_kpart( libkdevfileview AUTOMOC SOURCES fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp @@ -45,9 +45,9 @@ tde_add_kpart( libtdevfileview AUTOMOC ) -##### libtdevfilegroups (module) ################ +##### libkdevfilegroups (module) ################ -tde_add_kpart( libtdevfilegroups AUTOMOC +tde_add_kpart( libkdevfilegroups AUTOMOC SOURCES filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui diff --git a/parts/fileview/Makefile.am b/parts/fileview/Makefile.am index 76f1460b..3211d736 100644 --- a/parts/fileview/Makefile.am +++ b/parts/fileview/Makefile.am @@ -3,24 +3,24 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfileview.la libtdevfilegroups.la +kde_module_LTLIBRARIES = libkdevfileview.la libkdevfilegroups.la -libtdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +libkdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +libkdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp +libkdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp -libtdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp +libkdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfileview.desktop tdevfilegroups.desktop +service_DATA = kdevfileview.desktop kdevfilegroups.desktop # not used currently -#rcdir = $(kde_datadir)/tdevfileview -#rc_DATA = tdevfileview.rc +#rcdir = $(kde_datadir)/kdevfileview +#rc_DATA = kdevfileview.rc noinst_HEADERS = vcscolorsconfigwidget.h stdfiletreewidgetimpl.h filetreeviewwidgetimpl.h vcsfiletreewidgetimpl.h fileitemfactory.h diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp index bf8d39a6..4f8fe422 100644 --- a/parts/fileview/filegroupsconfigwidget.cpp +++ b/parts/fileview/filegroupsconfigwidget.cpp @@ -39,7 +39,7 @@ FileGroupsConfigWidget::~FileGroupsConfigWidget() void FileGroupsConfigWidget::readConfig() { TQDomDocument &dom = *m_part->projectDom(); - DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/tdevfileview/groups", + DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern"); TQListViewItem *lastItem = 0; @@ -64,7 +64,7 @@ void FileGroupsConfigWidget::storeConfig() item = item->nextSibling(); } - DomUtil::writePairListEntry(*m_part->projectDom(), "/tdevfileview/groups", + DomUtil::writePairListEntry(*m_part->projectDom(), "/kdevfileview/groups", "group", "name", "pattern", list); } diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 7b83b8ef..77fc9646 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -19,25 +19,25 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdialogbase.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevplugininfo.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevplugininfo.h" #include "filegroupswidget.h" #include "filegroupsconfigwidget.h" #define FILEGROUPS_OPTIONS 1 -typedef TDevGenericFactory<FileGroupsPart> FileGroupsFactory; -static const TDevPluginInfo data("tdevfilegroups"); -K_EXPORT_COMPONENT_FACTORY( libtdevfilegroups, FileGroupsFactory( data ) ) +typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory; +static const KDevPluginInfo data("kdevfilegroups"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "FileGroupsPart") + : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 88bed704..314f1663 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -15,12 +15,12 @@ #include <tqguardedptr.h> //#include <kdialogbase.h> #include <configwidgetproxy.h> -#include "tdevplugin.h" +#include "kdevplugin.h" class FileGroupsWidget; class KDialogBase; -class FileGroupsPart : public TDevPlugin +class FileGroupsPart : public KDevPlugin { Q_OBJECT diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 3c1c348f..8a3e19b4 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -27,10 +27,10 @@ #include <tdeaction.h> #include <tdeversion.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" #include "domutil.h" #include "filegroupspart.h" @@ -191,16 +191,16 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) (void) translations; // supress compiler warning TQDomDocument &dom = *m_part->projectDom(); - m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonprojectfiles") ); - m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonlocation") ); + m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonprojectfiles") ); + m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonlocation") ); } FileGroupsWidget::~FileGroupsWidget() { TQDomDocument &dom = *m_part->projectDom(); - DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() ); - DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() ); } @@ -319,7 +319,7 @@ void FileGroupsWidget::refresh() } TQDomDocument &dom = *m_part->projectDom(); DomUtil::PairList list = - DomUtil::readPairListEntry(dom, "/tdevfileview/groups", "group", "name", "pattern"); + DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern"); FileViewFolderItem *lastGroup = 0; diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index 62ec5d6f..3294db32 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -15,7 +15,7 @@ #include <tdelistview.h> class FileGroupsPart; -class TDevProject; +class KDevProject; class FileGroupsWidget : public TDEListView diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 3764a3f2..af6f9e1f 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -16,7 +16,7 @@ #include <tdelocale.h> #include <tdeversion.h> -#include <tdevproject.h> +#include <kdevproject.h> #include "fileviewpart.h" #include "filetreewidget.h" @@ -44,7 +44,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch // Reload good ol' settings TQDomDocument &dom = *m_part->projectDom(); - m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/tree/hidenonprojectfiles") ); + m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/tree/hidenonprojectfiles") ); } /////////////////////////////////////////////////////////////////////////////// @@ -56,7 +56,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() delete m_branchItemFactory; TQDomDocument &dom = *m_part->projectDom(); - DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index 0a1c5346..f89bf71d 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -26,11 +26,11 @@ #include <kurl.h> #include <tdeaction.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevversioncontrol.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevversioncontrol.h" #include "domutil.h" #include "urlutil.h" @@ -51,7 +51,7 @@ using namespace filetreeview; // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider ) +FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ) : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) { kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl; @@ -87,7 +87,7 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFil // Hide pattern for files TQDomDocument &dom = *m_part->projectDom(); TQString defaultHidePattern = "*.o,*.lo,CVS"; - TQString hidePattern = DomUtil::readEntry( dom, "/tdevfileview/tree/hidepatterns", defaultHidePattern ); + TQString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern ); m_hidePatterns = TQStringList::split( ",", hidePattern ); } @@ -98,7 +98,7 @@ FileTreeWidget::~FileTreeWidget() kdDebug(9017) << "FileTreeWidget::~FileTreeWidget()" << endl; TQDomDocument &dom = *m_part->projectDom(); - DomUtil::writeEntry( dom, "/tdevfileview/tree/hidepatterns", hidePatterns() ); + DomUtil::writeEntry( dom, "/kdevfileview/tree/hidepatterns", hidePatterns() ); // delete m_impl; } @@ -343,7 +343,7 @@ TQString FileTreeWidget::hidePatterns() const /////////////////////////////////////////////////////////////////////////////// -TDevVersionControl *FileTreeWidget::versionControl() const +KDevVersionControl *FileTreeWidget::versionControl() const { if (part() && part()->versionControl()) return part()->versionControl(); diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index a8d3e2bf..f6abb0c6 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -17,11 +17,11 @@ #include <tqguardedptr.h> #include <tdefiletreeview.h> -#include <tdevversioncontrol.h> +#include <kdevversioncontrol.h> class FileViewPart; class FileTreeViewWidgetImpl; -class TDevVersionControl; +class KDevVersionControl; /** * This is FileTree widget for listing files belonging to the project. It does feature: @@ -33,8 +33,8 @@ class TDevVersionControl; * Design notes * The class uses two different implementations (referred by m_impl data member): * - @see VCSFileTreeWidgetImpl for VCS support -* VCS support is detencted by the constructor looking for the @see TDevPlugin::versionControl() member: -* if the current VCS plug-in does offer a @see TDevVCSFileInfoProvider object than this will be used for +* VCS support is detencted by the constructor looking for the @see KDevPlugin::versionControl() member: +* if the current VCS plug-in does offer a @see KDevVCSFileInfoProvider object than this will be used for * querying about files' data. If neither VCS plugin nor valid info provider is found then the filetreeview * will fallback to the standard implementation * - @see StdFileTreeWidgetImpl for standard visualization, just like the KFileTreeView @@ -49,7 +49,7 @@ class FileTreeWidget : public KFileTreeView Q_OBJECT public: - FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider ); + FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~FileTreeWidget(); void openDirectory(const TQString &dirName); @@ -60,7 +60,7 @@ public: FileViewPart *part() const { return m_part; } - //TDevVCSFileInfoProvider *vcsFileInfoProvider() const; + //KDevVCSFileInfoProvider *vcsFileInfoProvider() const; void applyHidePatterns( const TQString &hidePatterns ); TQString hidePatterns() const; @@ -85,7 +85,7 @@ private slots: private: bool matchesHidePattern(const TQString &fileName); - TDevVersionControl *versionControl() const; + KDevVersionControl *versionControl() const; TQStringList m_hidePatterns; /** diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 7da44996..414cea52 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -23,19 +23,19 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdialogbase.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" #include "partwidget.h" #include "domutil.h" #include "filetreewidget.h" #include "vcscolorsconfigwidget.h" -#include "tdevversioncontrol.h" -#include "tdevplugininfo.h" +#include "kdevversioncontrol.h" +#include "kdevplugininfo.h" #define FILETREE_OPTIONS 1 @@ -49,20 +49,20 @@ VCSColors FileViewPart::vcsColors; // class factory /////////////////////////////////////////////////////////////////////////////// -typedef TDevGenericFactory<FileViewPart> FileViewFactory; -static const TDevPluginInfo data("tdevfileview"); -K_EXPORT_COMPONENT_FACTORY( libtdevfileview, FileViewFactory( data ) ) +typedef KDevGenericFactory<FileViewPart> FileViewFactory; +static const KDevPluginInfo data("kdevfileview"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) /////////////////////////////////////////////////////////////////////////////// // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "FileViewPart"), + : KDevPlugin(&data, parent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); - // setXMLFile("tdevfileview.rc"); + // setXMLFile("kdevfileview.rc"); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() ); @@ -153,9 +153,9 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, } } -TDevVersionControl *FileViewPart::versionControl() +KDevVersionControl *FileViewPart::versionControl() { - return extension<TDevVersionControl>("TDevelop/VersionControl"); + return extension<KDevVersionControl>("TDevelop/VersionControl"); } #include "fileviewpart.moc" diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index c1c8c776..68eb6a56 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -14,14 +14,14 @@ #include <tqguardedptr.h> #include <configwidgetproxy.h> -#include "tdevplugin.h" +#include "kdevplugin.h" #include "vcscolorsconfigwidget.h" class PartWidget; class KDialogBase; -class TDevVersionControl; +class KDevVersionControl; -class FileViewPart : public TDevPlugin +class FileViewPart : public KDevPlugin { Q_OBJECT @@ -33,7 +33,7 @@ public: //! Colors to use for VCS visual feed-back static VCSColors vcsColors; - TDevVersionControl *versionControl(); + KDevVersionControl *versionControl(); private slots: void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); diff --git a/parts/fileview/tdevfilegroups.desktop b/parts/fileview/kdevfilegroups.desktop index 4c04c274..bfa3e699 100644 --- a/parts/fileview/tdevfilegroups.desktop +++ b/parts/fileview/kdevfilegroups.desktop @@ -33,7 +33,7 @@ Comment[tg]=Барои файлҳои дар номҳои қолиб имкон Comment[tr]=Dosya adı desenlerine göre proje dosyalarının gruplanmasını sağlar. Comment[zh_CN]=允许你根据文件名模式规类工程文件。 Comment[zh_TW]=允許專案檔案根據檔名樣式來分群組。 -Name=TDevFileGroups +Name=KDevFileGroups Name[da]=TDevelop filgrupper Name[de]=Dateigruppen-Komponente (TDevelop) Name[hi]=के-डेव-फ़ाइल-ग्रुप्स @@ -80,7 +80,7 @@ GenericName[zh_CN]=文件分组 GenericName[zh_TW]=檔案群組 ServiceTypes=TDevelop/Plugin Icon=attach -X-TDE-Library=libtdevfilegroups +X-TDE-Library=libkdevfilegroups X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=ProjectFileGroupsManagement diff --git a/parts/fileview/tdevfileview.desktop b/parts/fileview/kdevfileview.desktop index b589b5ef..6a702e1b 100644 --- a/parts/fileview/tdevfileview.desktop +++ b/parts/fileview/kdevfileview.desktop @@ -32,7 +32,7 @@ Comment[tg]=Тариқи навигатсияро ва ҳангоми ҳамко Comment[tr]=Geçerli projenin kaynak dosyalarında gezinme ve onlarla etkileşime geçme yolu sunar. Comment[zh_CN]=提供当前工程源文件的浏览和相互关系。 Comment[zh_TW]=提供目前專案的程式源碼檔的導覽與互動。 -Name=TDevFileView +Name=KDevFileView Name[da]=TDevelop filvisning Name[de]=Dateibaum (TDevelop) Name[hi]=के-डेव-फ़ाइल-व्यू @@ -79,7 +79,7 @@ GenericName[zh_CN]=文件树 GenericName[zh_TW]=檔案樹 ServiceTypes=TDevelop/Plugin Icon=folder -X-TDE-Library=libtdevfileview +X-TDE-Library=libkdevfileview X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=ProjectFileManagement diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index 49cfe7d5..bf68de83 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -22,10 +22,10 @@ #include <kiconloader.h> #include <tdelocale.h> -#include "tdevversioncontrol.h" -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" +#include "kdevversioncontrol.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" #include "fileviewpart.h" #include "filetreewidget.h" @@ -40,7 +40,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) { Q_ASSERT( part && parent ); - TDevVCSFileInfoProvider *infoProvider = 0; + KDevVCSFileInfoProvider *infoProvider = 0; if (part && part->versionControl() && part->versionControl()->fileInfoProvider()) infoProvider = part->versionControl()->fileInfoProvider(); diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index e08068db..450a6a58 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tdeversion.h> -//#include <tdevproject.h> +//#include <kdevproject.h> #include <urlutil.h> #include <domutil.h> @@ -127,13 +127,13 @@ class VCSFileTreeBranchItem : public filetreeview::FileTreeBranchItem { public: VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix, - TDevVCSFileInfoProvider *vcsInfoProvider ) + KDevVCSFileInfoProvider *vcsInfoProvider ) : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {} // virtual ~VCSFileTreeBranchItem() {} virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); private: - TDevVCSFileInfoProvider *m_vcsInfoProvider; + KDevVCSFileInfoProvider *m_vcsInfoProvider; }; /////////////////////////////////////////////////////////////////////////////// @@ -169,20 +169,20 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* class VCSBranchItemFactory : public filetreeview::BranchItemFactory { public: - VCSBranchItemFactory( TDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {} + VCSBranchItemFactory( KDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {} virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) { return new VCSFileTreeBranchItem( view, url, name, pix, m_vcsInfoProvider ); } private: - TDevVCSFileInfoProvider *m_vcsInfoProvider; + KDevVCSFileInfoProvider *m_vcsInfoProvider; }; /////////////////////////////////////////////////////////////////////////////// // class VCSFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider ) +VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ) : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ), m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ), m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 ) @@ -216,7 +216,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFil m_actionSyncWithRepository->setWhatsThis( aboutAction ); TQDomDocument &dom = projectDom(); - m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/tdevfileview/tree/showvcsfields") ); + m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); } @@ -228,7 +228,7 @@ VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl() kdDebug(9017) << "VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()" << endl; TQDomDocument &dom = projectDom(); - DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/showvcsfields", showVCSFields() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/showvcsfields", showVCSFields() ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index 928fe544..00a38b32 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -14,7 +14,7 @@ #include "filetreeviewwidgetimpl.h" -class TDevVCSFileInfoProvider; +class KDevVCSFileInfoProvider; class TDEAction; class TDEToggleAction; @@ -27,7 +27,7 @@ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl Q_OBJECT public: - VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider ); + VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~VCSFileTreeWidgetImpl(); /* @@ -44,7 +44,7 @@ private slots: //! show/hide the header and the additional fields (status and versions) void slotToggleShowVCSFields( bool checked ); //! start a sync operation with the remote repository: this may take a while so we use - //! the async interface provided by the TDevVCSFileInfoProvider interface + //! the async interface provided by the KDevVCSFileInfoProvider interface void slotSyncWithRepository(); //! when the requested info are ready the infoProvider object will be so kind the //! to give them to us in a ready-to-use format: we'll use that info to update all @@ -58,7 +58,7 @@ private: TDEToggleAction *m_actionToggleShowVCSFields; TDEAction *m_actionSyncWithRepository; - TDevVCSFileInfoProvider *m_vcsInfoProvider; + KDevVCSFileInfoProvider *m_vcsInfoProvider; //! We use this guard to avoid enabling the "reload tree" action when performing //! syncing with remote repositories. bool m_isSyncingWithRepository; |