diff options
author | Michele Calgaro <[email protected]> | 2014-05-25 15:36:59 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2014-05-25 15:36:59 +0900 |
commit | b664098e9a21f427e27d50b6e3eb2c9dea83be99 (patch) | |
tree | 1c282f95e4a3748df586972d6898950d931b1a15 | |
parent | 41f7ca9b5d2cf09d3a1bfcb32f086408ce1f4c9e (diff) | |
download | tdevelop-b664098e9a21f427e27d50b6e3eb2c9dea83be99.tar.gz tdevelop-b664098e9a21f427e27d50b6e3eb2c9dea83be99.zip |
Revert "Minor tdevelop->kdevelop restorations in support of commit 722ce1ef."
This reverts commit 2c241008bc2a541aba15e83447f45970db3f59df.
-rw-r--r-- | doc/api/HighPriTasks.dox | 2 | ||||
-rw-r--r-- | doc/tdevelop/getting-started.docbook | 2 | ||||
-rw-r--r-- | doc/tdevelop/project-advanced.docbook | 2 | ||||
-rw-r--r-- | languages/cpp/doc/qt-tdev3.toc | 4 | ||||
-rw-r--r-- | parts/classview/classviewwidget.cpp | 4 | ||||
-rw-r--r-- | parts/classview/classviewwidget.h | 2 | ||||
-rw-r--r-- | src/projectmanager.cpp | 6 | ||||
-rw-r--r-- | src/projectmanager.h | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/doc/api/HighPriTasks.dox b/doc/api/HighPriTasks.dox index 062b3b06..7bcbaf1f 100644 --- a/doc/api/HighPriTasks.dox +++ b/doc/api/HighPriTasks.dox @@ -12,7 +12,7 @@ This way the .tdevelop file can be shared in teams of developers. -\section KDevelop2compat KDevelop 2 compatibility +\section TDevelop2compat KDevelop 2 compatibility (These are things that must be accomplished before we can say that KDevelop 3 >= tdevelop 2.x UI-wise and functionality-wise!) diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook index 299bf08e..39d7c4de 100644 --- a/doc/tdevelop/getting-started.docbook +++ b/doc/tdevelop/getting-started.docbook @@ -1127,7 +1127,7 @@ and <filename>hello.kdevses</filename>.</para> <para>Of particular importance in each project is the <filename>xxx.tdevelop</filename> (where <quote>xxx</quote> denotes the project -name) file. It is the main <emphasis>TDevelop Project File</emphasis> and +name) file. It is the main <emphasis>TDevelop 3 Project File</emphasis> and needed if you later want load this project into the &IDE;.</para> <warning> diff --git a/doc/tdevelop/project-advanced.docbook b/doc/tdevelop/project-advanced.docbook index f96fce2a..81c0e4a6 100644 --- a/doc/tdevelop/project-advanced.docbook +++ b/doc/tdevelop/project-advanced.docbook @@ -45,7 +45,7 @@ <title>Converting Old TDevelop Project Files</title> <para> -&tdevelop; allows you to open old KDevelop 2.x project files and convert them to &tdevelop; files. To do so go to <guimenuitem>Open Project...</guimenuitem> and select <guilabel>KDevelop 2 project files</guilabel> in the <guilabel>Filter:</guilabel>. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a <guilabel>&tdevelop; project file</guilabel>. +&tdevelop; allows you to open old TDevelop 2.x project files and convert them to &tdevelop; files. To do so go to <guimenuitem>Open Project...</guimenuitem> and select <guilabel>TDevelop 2 project files</guilabel> in the <guilabel>Filter:</guilabel>. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a <guilabel>&tdevelop; project file</guilabel>. </para> </sect2> <!-- converting-projects --> diff --git a/languages/cpp/doc/qt-tdev3.toc b/languages/cpp/doc/qt-tdev3.toc index 097581e4..3f6ffff0 100644 --- a/languages/cpp/doc/qt-tdev3.toc +++ b/languages/cpp/doc/qt-tdev3.toc @@ -1,14 +1,14 @@ <!DOCTYPE tdeveloptoc> <tdeveloptoc> <title>Qt Designer-3 and TDevelop-3</title> -<base href="http://women.kde.org/articles/tutorials/kdevelop3"/> +<base href="http://women.kde.org/articles/tutorials/tdevelop3"/> <tocsect1 name="Index" url="index.html"> </tocsect1> <tocsect1 name="Introduction" url="introduction.html"> </tocsect1> <tocsect1 name="Requirements" url="requirements.html"> <tocsect2 name="How to get Qt Designer" url="requirements.html"/> - <tocsect2 name="How to get TDevelop" url="get-kevelop.html"/> + <tocsect2 name="How to get TDevelop 3" url="get-kevelop.html"/> <tocsect2 name="Lexicon" url="lexicon.html"/> </tocsect1> <tocsect1 name="Creating the application" url="creating.html"> diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 9e96f2d7..cede06f3 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -252,7 +252,7 @@ void ClassViewWidget::insertFile( const TQString& fileName ) } break; - case KDevelop2ViewMode: + case TDevelop2ViewMode: { } break; @@ -293,7 +293,7 @@ void ClassViewWidget::removeFile( const TQString& fileName ) } break; - case KDevelop2ViewMode: + case TDevelop2ViewMode: { } break; diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index f51cf65c..1d17efec 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -51,7 +51,7 @@ public: enum ViewMode { KDevelop3ViewMode = 0, - KDevelop2ViewMode, + TDevelop2ViewMode, JavaLikeViewMode }; diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index bf656ff4..3ced0d63 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -97,7 +97,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) this, TQT_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); - action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project.")); + action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or TDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, @@ -138,7 +138,7 @@ void ProjectManager::slotOpenProject() return; if (url.path().endsWith("tdevprj")) - loadKDevelop2Project( url ); + loadTDevelop2Project( url ); else loadProject( url ); } @@ -611,7 +611,7 @@ ProjectSession* ProjectManager::projectSession() const return m_pProjectSession; } -bool ProjectManager::loadKDevelop2Project( const KURL & url ) +bool ProjectManager::loadTDevelop2Project( const KURL & url ) { if( !url.isValid() || !url.isLocalFile() ){ KMessageBox::sorry(0, i18n("Invalid URL.")); diff --git a/src/projectmanager.h b/src/projectmanager.h index d82b7cf4..3c1b3599 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -65,7 +65,7 @@ public: public slots: bool loadProject( const KURL& url); - bool loadKDevelop2Project( const KURL& url); + bool loadTDevelop2Project( const KURL& url); bool closeProject( bool exiting = false ); private slots: |