| 2c241008 | 2014-03-02 18:05:41 | Darrell Anderson |
Minor tdevelop->kdevelop restorations in support of commit 722ce1ef. |
||
|
M doc/api/HighPriTasks.dox M doc/tdevelop/getting-started.docbook M doc/tdevelop/project-advanced.docbook M languages/cpp/doc/qt-tdev3.toc M parts/classview/classviewwidget.cpp M parts/classview/classviewwidget.h M src/projectmanager.cpp M src/projectmanager.h |
||
diff --git a/doc/api/HighPriTasks.dox b/doc/api/HighPriTasks.dox
index 7bcbaf1..062b3b0 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 TDevelop2compat KDevelop 2 compatibility
+\section KDevelop2compat 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 39d7c4d..299bf08 100644
--- a/doc/tdevelop/getting-started.docbook
+++ b/doc/tdevelop/getting-started.docbook
@@ -1127,7 +1127,7 @@
<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 3 Project File</emphasis> and
+name) file. It is the main <emphasis>TDevelop 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 81c0e4a..f96fce2 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 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>.
+&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>.
</para>
</sect2> <!-- converting-projects -->
diff --git a/languages/cpp/doc/qt-tdev3.toc b/languages/cpp/doc/qt-tdev3.toc
index 3f6ffff..097581e 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/tdevelop3"/>
+<base href="http://women.kde.org/articles/tutorials/kdevelop3"/>
<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 3" url="get-kevelop.html"/>
+ <tocsect2 name="How to get TDevelop" 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 cede06f..9e96f2d 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -252,7 +252,7 @@
}
break;
- case TDevelop2ViewMode:
+ case KDevelop2ViewMode:
{
}
break;
@@ -293,7 +293,7 @@
}
break;
- case TDevelop2ViewMode:
+ case KDevelop2ViewMode:
{
}
break;
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index 1d17efe..f51cf65 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -51,7 +51,7 @@
enum ViewMode
{
KDevelop3ViewMode = 0,
- TDevelop2ViewMode,
+ KDevelop2ViewMode,
JavaLikeViewMode
};
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 3ced0d6..bf656ff 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -97,7 +97,7 @@
this, TQT_SLOT(slotOpenProject()),
ac, "project_open");
action->setToolTip( i18n("Open project"));
- action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or TDevelop2 project."));
+ action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project."));
m_openRecentProjectAction =
new TDERecentFilesAction(i18n("Open &Recent Project"), 0,
@@ -138,7 +138,7 @@
return;
if (url.path().endsWith("tdevprj"))
- loadTDevelop2Project( url );
+ loadKDevelop2Project( url );
else
loadProject( url );
}
@@ -611,7 +611,7 @@
return m_pProjectSession;
}
-bool ProjectManager::loadTDevelop2Project( const KURL & url )
+bool ProjectManager::loadKDevelop2Project( 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 3c1b359..d82b7cf 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -65,7 +65,7 @@
public slots:
bool loadProject( const KURL& url);
- bool loadTDevelop2Project( const KURL& url);
+ bool loadKDevelop2Project( const KURL& url);
bool closeProject( bool exiting = false );
private slots:
|
||