summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeL10n.txt1
m---------admin0
-rw-r--r--kamera/tdeioslave/kamera.cpp2
-rw-r--r--kfaxview/libkfaximage/kfaximage.h2
-rw-r--r--kghostview/displayoptions.h2
-rw-r--r--kghostview/kgv_view.h2
-rw-r--r--kghostview/kgvdocument.cpp3
-rw-r--r--kghostview/kgvfactory.h2
-rw-r--r--kghostview/kgvshell.h2
-rw-r--r--kuickshow/src/main.cpp2
-rw-r--r--kview/kimageviewer/canvas.h2
-rw-r--r--kview/kimageviewer/viewer.h2
-rw-r--r--kview/kviewcanvas/kimagecanvas.h2
-rw-r--r--kview/kviewviewer/kviewviewer.h2
-rw-r--r--kview/main.cpp2
-rw-r--r--tdefile-plugins/ps/gscreator.cpp2
-rw-r--r--tdefile-plugins/raw/kcamerarawplugin.cpp4
-rw-r--r--translations/desktop_files/ksvg-desktops/ru.po12
18 files changed, 23 insertions, 23 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index f0fc72d8..c3f87456 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -14,7 +14,6 @@
include( TDEVersion )
cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
-tde_set_project_version( )
##### include our cmake modules #################
diff --git a/admin b/admin
-Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7
+Subproject 7fc9aedfb802dbb23da9f54134dd1c381124bc5
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 96d65e9a..9190db9d 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -53,7 +53,7 @@ using namespace TDEIO;
extern "C"
{
- KDE_EXPORT int kdemain(int argc, char **argv);
+ TDE_EXPORT int kdemain(int argc, char **argv);
#ifdef HAVE_GPHOTO2_5
static void frontendCameraStatus(GPContext *context, const char *status, void *data);
diff --git a/kfaxview/libkfaximage/kfaximage.h b/kfaxview/libkfaximage/kfaximage.h
index f24d47eb..56f6cc43 100644
--- a/kfaxview/libkfaximage/kfaximage.h
+++ b/kfaxview/libkfaximage/kfaximage.h
@@ -50,7 +50,7 @@ class pagenode;
#define KFAX_DPI_SUPERFINE TQPoint(406,392)
-class KDE_EXPORT KFaxImage : public TQObject
+class TDE_EXPORT KFaxImage : public TQObject
{
TQ_OBJECT
diff --git a/kghostview/displayoptions.h b/kghostview/displayoptions.h
index 78ecc0d4..34a10588 100644
--- a/kghostview/displayoptions.h
+++ b/kghostview/displayoptions.h
@@ -24,7 +24,7 @@
class TDECmdLineArgs;
class TDEConfig;
-class KDE_EXPORT DisplayOptions
+class TDE_EXPORT DisplayOptions
{
public:
DisplayOptions();
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 3859b675..9a1e23da 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -77,7 +77,7 @@ public:
*/
virtual bool closeURL();
- KDE_EXPORT static TDEAboutData* createAboutData();
+ TDE_EXPORT static TDEAboutData* createAboutData();
public slots:
/**
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index c08b68f1..8a1a6776 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -17,6 +17,7 @@
*/
#include <algorithm>
+#include <functional>
#include <memory>
#include <tqfileinfo.h>
@@ -618,7 +619,7 @@ bool KGVDocument::savePages( const TQString& saveFileName,
PageList normedPageList;
transform( pageList.begin(), pageList.end(),
back_inserter( normedPageList ),
- bind2nd( minus<int>(), minPage - 1 ) );
+ bind( minus<int>(), std::placeholders::_1, minPage - 1 ) );
// Finally select the desired pages from the converted file.
psCopyDoc( psSaveFile.name(), saveFileName, normedPageList );
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h
index d0ac9550..612a6d21 100644
--- a/kghostview/kgvfactory.h
+++ b/kghostview/kgvfactory.h
@@ -25,7 +25,7 @@
class TDEInstance;
class TDEAboutData;
-class KDE_EXPORT KGVFactory : public KParts::Factory
+class TDE_EXPORT KGVFactory : public KParts::Factory
{
public:
KGVFactory();
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index 98915ec6..1c90673d 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -35,7 +35,7 @@ class TDEPopupMenu;
class DisplayOptions;
class FullScreenFilter;
-class KDE_EXPORT KGVShell : public KParts::MainWindow
+class TDE_EXPORT KGVShell : public KParts::MainWindow
{
TQ_OBJECT
diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp
index f2633626..547b249b 100644
--- a/kuickshow/src/main.cpp
+++ b/kuickshow/src/main.cpp
@@ -36,7 +36,7 @@ static TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
{
TDEAboutData about(
"kuickshow", I18N_NOOP( "KuickShow" ), KUICKSHOWVERSION,
diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h
index b697c01e..2f36f843 100644
--- a/kview/kimageviewer/canvas.h
+++ b/kview/kimageviewer/canvas.h
@@ -67,7 +67,7 @@ namespace KImageViewer
* until it's finished. So if you're using this interface please get in contact
* with me.
*/
-class KDE_EXPORT Canvas
+class TDE_EXPORT Canvas
{
public:
/**
diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h
index 7334c16b..38372cfb 100644
--- a/kview/kimageviewer/viewer.h
+++ b/kview/kimageviewer/viewer.h
@@ -45,7 +45,7 @@ namespace KImageViewer
* until it's finished. So if you're using this interface please get in contact
* with me.
*/
-class KDE_EXPORT Viewer : public KParts::ReadWritePart
+class TDE_EXPORT Viewer : public KParts::ReadWritePart
{
TQ_OBJECT
diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h
index f9ea3e73..b0d90d18 100644
--- a/kview/kviewcanvas/kimagecanvas.h
+++ b/kview/kviewcanvas/kimagecanvas.h
@@ -39,7 +39,7 @@ class KPixmap;
* @author Matthias Kretz <kretz@kde.org>
* @version $Id$
*/
-class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
+class TDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
{
TQ_OBJECT
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 691b40c4..dae95c9a 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -42,7 +42,7 @@ class KDirWatch;
template<class T>
class TQCache;
-class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
+class TDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
{
TQ_OBJECT
diff --git a/kview/main.cpp b/kview/main.cpp
index 9faba378..6d1e8227 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -31,7 +31,7 @@ static TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
{
TDEAboutData about( "kview", I18N_NOOP( "KView" ),
KVIEW_VERSION, description,
diff --git a/tdefile-plugins/ps/gscreator.cpp b/tdefile-plugins/ps/gscreator.cpp
index 88601a4c..e654efeb 100644
--- a/tdefile-plugins/ps/gscreator.cpp
+++ b/tdefile-plugins/ps/gscreator.cpp
@@ -81,7 +81,7 @@
extern "C"
{
- KDE_EXPORT ThumbCreator *new_creator()
+ TDE_EXPORT ThumbCreator *new_creator()
{
return new GSCreator;
}
diff --git a/tdefile-plugins/raw/kcamerarawplugin.cpp b/tdefile-plugins/raw/kcamerarawplugin.cpp
index 6ac4759c..dd367f65 100644
--- a/tdefile-plugins/raw/kcamerarawplugin.cpp
+++ b/tdefile-plugins/raw/kcamerarawplugin.cpp
@@ -38,8 +38,8 @@ typedef KGenericFactory<KCameraRawPlugin> RawFactory;
K_EXPORT_COMPONENT_FACTORY(tdefile_raw, RawFactory("tdefile_raw"))
-#ifndef KDE_EXPORT
-# define KDE_EXPORT
+#ifndef TDE_EXPORT
+# define TDE_EXPORT
#endif
/* Main entry point into raw parser */
diff --git a/translations/desktop_files/ksvg-desktops/ru.po b/translations/desktop_files/ksvg-desktops/ru.po
index 5ea5b383..d2f56fc0 100644
--- a/translations/desktop_files/ksvg-desktops/ru.po
+++ b/translations/desktop_files/ksvg-desktops/ru.po
@@ -1,12 +1,12 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-08 23:58+0200\n"
-"PO-Revision-Date: 2023-12-03 17:55+0000\n"
+"PO-Revision-Date: 2024-05-11 01:02+0000\n"
"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/tdegraphics/ksvg-desktop-files/ru/>\n"
@@ -26,22 +26,22 @@ msgstr "Движок прорисовки KSVG"
#. Name
#: plugin/backends/agg/ksvgaggcanvas.desktop:6
msgid "KSVG Rendering Backend - Anti Grain Geometry"
-msgstr "Движок отрисовки KSVG - противозернистая геометрия"
+msgstr "Движок отрисовки KSVG — противозернистая геометрия"
#. Comment
#: plugin/backends/agg/ksvgaggcanvas.desktop:7
msgid "New, unstable ksvg rendering backend"
-msgstr "Новый, нестабильный движок прорисовки ksvg"
+msgstr "Новый, нестабильный движок прорисовки KSVG"
#. Name
#: plugin/backends/libart/ksvglibartcanvas.desktop:6
msgid "KSVG Rendering Backend - Libart"
-msgstr "Движок отрисовки KSVG - Libart"
+msgstr "Движок отрисовки KSVG — Libart"
#. Comment
#: plugin/backends/libart/ksvglibartcanvas.desktop:7
msgid "Mature ksvg rendering backend"
-msgstr "Старый движок отрисовки ksvg"
+msgstr "Старый движок отрисовки KSVG"
#. Name
#: plugin/ksvgplugin.desktop:2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 19:18:42 +0000