summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------admin0
-rw-r--r--doc/tde_app_devel/index.docbook2
-rw-r--r--doc/tdevelop/setup.docbook3
-rw-r--r--languages/cpp/main.cpp14
-rw-r--r--languages/java/app_templates/kappjava/app_client.java10
-rw-r--r--lib/antlr/antlr/config.h9
-rw-r--r--lib/antlr/src/String.cpp6
-rw-r--r--lib/astyle/ASFormatter.cpp2
m---------parts/appwizard/common/admin0
-rw-r--r--parts/doxygen/config.cpp15
-rw-r--r--translations/desktop_files/tdevelop-desktops/pl.po17
-rw-r--r--translations/desktop_files/tdevelop-eventsrc/pl.po16
12 files changed, 27 insertions, 67 deletions
diff --git a/admin b/admin
-Subproject 6fa5fdb7176897672b2e2a0cf4ae7bacc0d57f7
+Subproject afaec96a4101e0771fb9969690e20ce5f6df90e
diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
index f24131a9..32a16a42 100644
--- a/doc/tde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -1276,7 +1276,7 @@ As an example, we have a look at the "New File" button in a generic application:
</para>
<para>
There, the part i18n("New File") provides a tool-tip message. It is enclosed by the i18n()
-macro provided by kapp.h to translate the tool-tip towards the currently selected language.
+macro provided by tdeapplication.h to translate the tool-tip towards the currently selected language.
</para>
<para>
Tool-tips can also be added to any custom widget by using the <classname>QToolTip</classname>
diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook
index 0c078a3b..6f217c27 100644
--- a/doc/tdevelop/setup.docbook
+++ b/doc/tdevelop/setup.docbook
@@ -344,8 +344,7 @@ A typical example of this user interface mode is KDEStudio, our friend C++-IDE i
<listitem><para>
<link linkend="toplevel-desc">Toplevel window mode</link>
</para><para>All editor, browser and tool views will be toplevel windows (directly on desktop).
-The main widget contains the menu, toolbars and statusbar only.
-A typical example of this user interface mode is Borland Delphi 6.0.</para></listitem>
+The main widget contains the menu, toolbars and statusbar only.</para></listitem>
</itemizedlist>
<para>
diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp
index 7ec48cfa..f790861e 100644
--- a/languages/cpp/main.cpp
+++ b/languages/cpp/main.cpp
@@ -132,20 +132,6 @@ public:
}
}
- else if ( qmakespec == "win32-borland" )
- {
- TQString incl = getenv( "INCLUDE" );
- TQStringList includePaths = TQStringList::split( ';', incl );
- TQStringList::Iterator it = includePaths.begin();
- while ( it != includePaths.end() )
- {
- addIncludePath( ( *it ).stripWhiteSpace() );
- ++it;
- }
- // ### I am sure there are more standard include paths on
- // ### windows. I will fix that soon
- // ### Also do the compiler specific defines on windows
- }
}
private:
diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java
index ab327d4c..4b310179 100644
--- a/languages/java/app_templates/kappjava/app_client.java
+++ b/languages/java/app_templates/kappjava/app_client.java
@@ -2,10 +2,10 @@
* Copyright (C) %{YEAR} %{AUTHOR} <%{EMAIL}>
*/
-#include <kapp.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
int main(int argc, char **argv)
{
@@ -16,8 +16,8 @@ int main(int argc, char **argv)
client->attach();
// do a 'send' for now
- QByteArray data;
- QDataStream ds(data, IO_WriteOnly);
+ TQByteArray data;
+ TQDataStream ds(data, IO_WriteOnly);
if (argc > 1)
ds << TQString(argv[1]);
else
diff --git a/lib/antlr/antlr/config.h b/lib/antlr/antlr/config.h
index 4d3456ec..200463b8 100644
--- a/lib/antlr/antlr/config.h
+++ b/lib/antlr/antlr/config.h
@@ -265,15 +265,6 @@
#endif
/*}}}*/
/*****************************************************************************/
-#ifdef __BORLANDC__
-# if __BORLANDC__ >= 560
-# include <ctype>
-# include <stdlib>
-# define ANTLR_CCTYPE_NEEDS_STD
-# else
-# error "sorry, compiler is too old - consider an update."
-# endif
-#endif
// Redefine these for backwards compatability..
#undef ANTLR_BEGIN_NAMESPACE
diff --git a/lib/antlr/src/String.cpp b/lib/antlr/src/String.cpp
index 6d8b43cf..39b09ab1 100644
--- a/lib/antlr/src/String.cpp
+++ b/lib/antlr/src/String.cpp
@@ -19,12 +19,6 @@
namespace antlr {
#endif
-// wh: hack for Borland C++ 5.6
-#if __BORLANDC__
- using std::sprintf;
-#endif
-
-
// RK: should be using snprintf actually... (or stringstream)
ANTLR_C_USING(sprintf)
diff --git a/lib/astyle/ASFormatter.cpp b/lib/astyle/ASFormatter.cpp
index eb418760..bf88affd 100644
--- a/lib/astyle/ASFormatter.cpp
+++ b/lib/astyle/ASFormatter.cpp
@@ -1652,7 +1652,7 @@ void ASFormatter::adjustComments(void)
if (formattedLine.find_last_not_of(' ') < len - adjust - 1
&& formattedLine[len-1] != '\t') // don't adjust a tab
formattedLine.resize(len - adjust);
- // the following are commented out to avoid a Borland compiler warning
+ // the following are commented out to avoid compiler warning
//else
// adjust = 0;
TRcomment(-adjust); // trace macro
diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin
-Subproject 6fa5fdb7176897672b2e2a0cf4ae7bacc0d57f7
+Subproject afaec96a4101e0771fb9969690e20ce5f6df90e
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index 4299c300..953d183d 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -71,15 +71,6 @@ bool portable_fileSystemIsCaseSensitive()
#endif /* __STDC__ */
#endif /* ! __cplusplus */
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
#ifdef YY_USE_CONST
#define yyconst const
#else
@@ -2956,13 +2947,9 @@ void Config::check()
#undef PUTENV
#undef SEP
-#if defined(_WIN32) && (__BORLANDC__ < 0x0550)
-#define PUTENV _putenv
-#define SEP ";"
-#else
#define PUTENV putenv
#define SEP ":"
-#endif
+
// check TQHP creation requirements
if (Config_getBool("GENERATE_TQHP"))
{
diff --git a/translations/desktop_files/tdevelop-desktops/pl.po b/translations/desktop_files/tdevelop-desktops/pl.po
index ae976740..0ae3f186 100644
--- a/translations/desktop_files/tdevelop-desktops/pl.po
+++ b/translations/desktop_files/tdevelop-desktops/pl.po
@@ -1,20 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Eryk Michalak <gnu.ewm@protonmail.com>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-13 21:37+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-09-18 05:11+0000\n"
+"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdevelop/tdevelop-desktop-files/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
#. Name
#: buildtools/ada/kdevadaproject.desktop:2
@@ -141,9 +143,8 @@ msgstr "Okno dialogowe do wyboru edytora."
#. Name
#: embedded/visualboyadvance/kdevvisualboyadvance.desktop:2
-#, fuzzy
msgid "KDevVisualBoyAdvance"
-msgstr "Obsługa VisualBoyAdvance"
+msgstr "KDevVisualBoyAdvance"
#. GenericName
#: embedded/visualboyadvance/kdevvisualboyadvance.desktop:4
diff --git a/translations/desktop_files/tdevelop-eventsrc/pl.po b/translations/desktop_files/tdevelop-eventsrc/pl.po
index f8742487..21dd5303 100644
--- a/translations/desktop_files/tdevelop-eventsrc/pl.po
+++ b/translations/desktop_files/tdevelop-eventsrc/pl.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Eryk Michalak <gnu.ewm@protonmail.com>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-22 04:04+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-09-18 05:11+0000\n"
+"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdevelop/tdevelop-events/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
#. Comment
#: src/eventsrc:3
msgid "KDevelop"
-msgstr ""
+msgstr "KDevelop"
#. Name
#: src/eventsrc:6