Use the complete definition of the prototype function gtk_style_render_icon.

This solves FTBFS in checking the compatibility of pointers.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

kcm_gtk/kcmgtk.cpp

@@ -52,7 +52,7 @@
 #include <tqmessagebox.h>
 #include <tqcheckbox.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -198,9 +198,9 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&)
 	load();
 	
 	// Connect some signals
-	connect(widget->warning2, TQ_SIGNAL(leftClickedURL(const TQString&)), TDEApplication::kApplication(), TQ_SLOT(invokeBrowser(const TQString&)));
+	connect(widget->warning2, TQ_SIGNAL(leftClickedURL(const TQString&)), tdeApp, TQ_SLOT(invokeBrowser(const TQString&)));
 	connect(widget->styleGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(itemChanged()));
-	connect(widget->warning5, TQ_SIGNAL(leftClickedURL(const TQString&)), TDEApplication::kApplication(), TQ_SLOT(invokeBrowser(const TQString&)));
+	connect(widget->warning5, TQ_SIGNAL(leftClickedURL(const TQString&)), tdeApp, TQ_SLOT(invokeBrowser(const TQString&)));
 	connect(widget->styleGroup3, TQ_SIGNAL(clicked(int)), TQ_SLOT(itemChanged()));
 	connect(widget->fontGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(itemChanged()));
 	connect(widget->styleBox, TQ_SIGNAL(activated(int)), TQ_SLOT(itemChanged()));

src/qt_qt_wrapper.cpp

@@ -24,8 +24,8 @@
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <tdeglobal.h>
-#include <kcrash.h>
-#include <kstandarddirs.h>
+#include <tdecrash.h>
+#include <tdestandarddirs.h>
 
 #undef signals
 #include <gdk/gdkx.h>

src/qt_theme_draw.c

@@ -32,7 +32,13 @@
 
 extern gboolean tde_showIconsOnPushButtons;
 
-static GdkPixbuf * (*stockRenderIcon)() = NULL;
+static GdkPixbuf * (*stockRenderIcon)(GtkStyle*,
+                        const GtkIconSource*,
+                        GtkTextDirection,
+                        GtkStateType,
+                        GtkIconSize,
+                        GtkWidget*,
+                        const gchar*) = NULL;
 // static void * (*stockDrawString)() = NULL;
 
 static void qtengine_style_init       (QtEngineStyle      *style);

translations/messages/gtk-qt-engine.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-10-31 20:20+0000\n"
+"POT-Creation-Date: 2024-10-31 18:21+0000\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"

translations/messages/sv.po

@@ -2,20 +2,22 @@
 # This file is distributed under the same license as the gtk2-tqt-engine package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Daniel Nylander <po@danielnylander.se>, 2006.
-#
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk-qt-engine 0.7\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-31 18:21+0000\n"
-"PO-Revision-Date: 2006-09-18 17:26+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"PO-Revision-Date: 2025-06-09 23:15+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/gtk-qt-engine/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Instead of a literal translation, add your name to the end of the list (separated by a comma).
 msgid ""
@@ -35,20 +37,20 @@ msgstr "%1 (storlek %2)"
 
 #: src/qt_qt_wrapper.cpp:115
 msgid "gtk2-tqt-engine"
-msgstr ""
+msgstr "gtk2-tqt-engine"
 
 #: src/qt_qt_wrapper.cpp:380
 msgid "Maintainer"
-msgstr ""
+msgstr "Underhållare"
 
 #: src/qt_qt_wrapper.cpp:381
 msgid "Original Author"
-msgstr ""
+msgstr "Ursprunglig upphovsman"
 
 #: kcm_gtk/emacsdetails.ui:16
 #, no-c-format
 msgid "Emacs Keyboard Shortcuts"
-msgstr ""
+msgstr "Emacs tangentbordsgenvägar"
 
 #: kcm_gtk/emacsdetails.ui:27
 #, no-c-format
@@ -57,111 +59,114 @@ msgid ""
 "When enabled, they will override the standard keyboard shortcuts in GTK "
 "applications."
 msgstr ""
+"Dessa tangentbordsgenvägar är användbara för Emacs-användare.\n"
+"När alternativet är markerat kommer de ersätta standardgenvägarna i GTK-"
+"program."
 
 #: kcm_gtk/emacsdetails.ui:34
 #, no-c-format
 msgid "Shortcut"
-msgstr ""
+msgstr "Genväg"
 
 #: kcm_gtk/emacsdetails.ui:45
 #, no-c-format
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #: kcm_gtk/emacsdetails.ui:56
 #, no-c-format
 msgid "Ctrl+A"
-msgstr ""
+msgstr "Ctrl+A"
 
 #: kcm_gtk/emacsdetails.ui:59
 #, no-c-format
 msgid "Go to beginning of line"
-msgstr ""
+msgstr "Gå till början av raden"
 
 #: kcm_gtk/emacsdetails.ui:70
 #, no-c-format
 msgid "Ctrl+E"
-msgstr ""
+msgstr "Ctrl+E"
 
 #: kcm_gtk/emacsdetails.ui:73
 #, no-c-format
 msgid "Go to end of line"
-msgstr ""
+msgstr "Gå till slutet av raden"
 
 #: kcm_gtk/emacsdetails.ui:84
 #, no-c-format
 msgid "Ctrl+F"
-msgstr ""
+msgstr "Ctrl+F"
 
 #: kcm_gtk/emacsdetails.ui:87
 #, no-c-format
 msgid "Go right one character"
-msgstr ""
+msgstr "Gå ett tecken åt höger"
 
 #: kcm_gtk/emacsdetails.ui:98
 #, no-c-format
 msgid "Ctrl+B"
-msgstr ""
+msgstr "Ctrl+B"
 
 #: kcm_gtk/emacsdetails.ui:101
 #, no-c-format
 msgid "Go left one character"
-msgstr ""
+msgstr "Gå ett tecken åt vänster"
 
 #: kcm_gtk/emacsdetails.ui:112
 #, no-c-format
 msgid "Ctrl+K"
-msgstr ""
+msgstr "Ctrl+K"
 
 #: kcm_gtk/emacsdetails.ui:115
 #, no-c-format
 msgid "Delete to end of line"
-msgstr ""
+msgstr "Radera fram till radens slut"
 
 #: kcm_gtk/emacsdetails.ui:126
 #, no-c-format
 msgid "Ctrl+U"
-msgstr ""
+msgstr "Ctrl+U"
 
 #: kcm_gtk/emacsdetails.ui:129
 #, no-c-format
 msgid "Delete entire line"
-msgstr ""
+msgstr "Radera hela raden"
 
 #: kcm_gtk/emacsdetails.ui:140
 #, no-c-format
 msgid "Ctrl+W"
-msgstr ""
+msgstr "Ctrl+W"
 
 #: kcm_gtk/emacsdetails.ui:143
 #, no-c-format
 msgid "Delete word, left"
-msgstr ""
+msgstr "Radera ett ord åt vänster"
 
 #: kcm_gtk/emacsdetails.ui:154
 #, no-c-format
 msgid "Ctrl+H"
-msgstr ""
+msgstr "Ctrl+H"
 
 #: kcm_gtk/emacsdetails.ui:157
 #, no-c-format
 msgid "Delete character, left"
-msgstr ""
+msgstr "Radera tecken åt vänster"
 
 #: kcm_gtk/emacsdetails.ui:168
 #, no-c-format
 msgid "Ctrl+D"
-msgstr ""
+msgstr "Ctrl+D"
 
 #: kcm_gtk/emacsdetails.ui:171
 #, no-c-format
 msgid "Delete character, right"
-msgstr ""
+msgstr "Radera tecken åt höger"
 
 #: kcm_gtk/emacsdetails.ui:217
 #, no-c-format
 msgid "C&lose"
-msgstr ""
+msgstr "&Stäng"
 
 #: kcm_gtk/kcmgtkwidget.ui:16 kcm_gtk/mozillaprofile.ui:16
 #, no-c-format
@@ -169,33 +174,33 @@ msgid "Form2"
 msgstr "Form2"
 
 #: kcm_gtk/kcmgtkwidget.ui:38
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "GTK2 Styles"
-msgstr "GTK-stilar"
+msgstr "GTK2-stilar"
 
 #: kcm_gtk/kcmgtkwidget.ui:117 kcm_gtk/kcmgtkwidget.ui:289
 #, no-c-format
 msgid "Change search paths..."
-msgstr ""
+msgstr "Ändra sökvägar…"
 
 #: kcm_gtk/kcmgtkwidget.ui:144
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "&Use my TDE style in GTK2 applications"
-msgstr "Använd min KDE-stil i GTK-program"
+msgstr "Använd min TDE-stil i GTK2-program"
 
 #: kcm_gtk/kcmgtkwidget.ui:168 kcm_gtk/kcmgtkwidget.ui:340
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Use &another style:"
-msgstr "Använd en annan stil:"
+msgstr "&Använd en annan stil:"
 
 #: kcm_gtk/kcmgtkwidget.ui:179
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<b>Warning:</b> The GTK2-TQt theme engine is not installed.  This means you "
 "will not be able to use your TDE style in GTK2 applications."
 msgstr ""
-"<b>Varning:</b> GTK2-TQt-temamotorn är inte installerad.  Det betyder att du "
-"inte kan använda din KDE-stil i GTK-program."
+"<b>Varning:</b> GTK2-TQt-temamotorn är inte installerad. Detta betyder att "
+"du inte kan använda din TDE-stil i GTK2-program."
 
 #: kcm_gtk/kcmgtkwidget.ui:187
 #, no-c-format
@@ -208,38 +213,38 @@ msgid "http://gtk-qt.ecs.soton.ac.uk/"
 msgstr "http://gtk-qt.ecs.soton.ac.uk/"
 
 #: kcm_gtk/kcmgtkwidget.ui:210
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "GTK3 Styles"
-msgstr "GTK-stilar"
+msgstr "GTK3-stilar"
 
 #: kcm_gtk/kcmgtkwidget.ui:316
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "&Use my TDE style in GTK3 applications"
-msgstr "Använd min KDE-stil i GTK-program"
+msgstr "Använd min TDE-stil i GTK3-program"
 
 #: kcm_gtk/kcmgtkwidget.ui:351
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<b>Warning:</b> The Gtk3-TQt theme engine is not installed.  This means you "
 "will not be able to use your TDE style in GTK3 applications."
 msgstr ""
-"<b>Varning:</b> GTK2-TQt-temamotorn är inte installerad.  Det betyder att du "
-"inte kan använda din KDE-stil i GTK-program."
+"<b>Varning:</b> Gtk3-TQt-temamotorn är inte installerad. Det betyder att du "
+"inte kan använda din TDE-stil i GTK3-program."
 
 #: kcm_gtk/kcmgtkwidget.ui:359
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Gtk3-TQt theme engine homepage"
-msgstr "Webbsidan för GTK2-TQt-temamotorn"
+msgstr "Webbsidan för Gtk3-TQt-temamotorn"
 
 #: kcm_gtk/kcmgtkwidget.ui:362
 #, no-c-format
 msgid "http://www.trinitydesktop.org/"
-msgstr ""
+msgstr "http://www.trinitydesktop.org/"
 
 #: kcm_gtk/kcmgtkwidget.ui:382
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "GTK2 Fonts"
-msgstr "GTK-typsnitt"
+msgstr "GTK2-typsnitt"
 
 #: kcm_gtk/kcmgtkwidget.ui:436
 #, no-c-format
@@ -257,9 +262,9 @@ msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
 msgstr "Flygande bäckasiner söka strax hwila på mjuka tuvor"
 
 #: kcm_gtk/kcmgtkwidget.ui:504
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Use m&y TDE fonts in GTK2 applications"
-msgstr "Använd mina KDE-typsnitt i GTK-program"
+msgstr "Använd mina TDE-typsnitt i GTK2-program"
 
 #: kcm_gtk/kcmgtkwidget.ui:537
 #, no-c-format
@@ -269,17 +274,17 @@ msgstr "Förhandsgranska rad 1"
 #: kcm_gtk/kcmgtkwidget.ui:554
 #, no-c-format
 msgid "GTK2 Keyboard Shortcuts"
-msgstr ""
+msgstr "GTK2 tangentbordsgenvägar"
 
 #: kcm_gtk/kcmgtkwidget.ui:608
 #, no-c-format
 msgid "Use Emacs-like key&board shortcuts for text editing"
-msgstr ""
+msgstr "Använd Emacs-liknande tangent&bordsgenvägar för textredigering"
 
 #: kcm_gtk/kcmgtkwidget.ui:624
 #, no-c-format
 msgid "Details..."
-msgstr ""
+msgstr "Detaljer..."
 
 #: kcm_gtk/kcmgtkwidget.ui:655
 #, no-c-format
@@ -288,6 +293,9 @@ msgid ""
 "running.  To change the styles and fonts used by applications in GNOME, use "
 "the GNOME configuration tools."
 msgstr ""
+"Notera att ändringar som görs här endast påverkar GTK-program när TDE körs. "
+"Om du vill ändra de stilar och typsnitt som används av program i GNOME ska "
+"du istället använda GNOME:s konfigurationsverktyg."
 
 #: kcm_gtk/mozillaprofile.ui:38
 #, no-c-format
@@ -302,7 +310,7 @@ msgstr "Profil"
 #: kcm_gtk/searchpaths.ui:16
 #, no-c-format
 msgid "Change search paths"
-msgstr ""
+msgstr "Ändra sökvägar"
 
 #: kcm_gtk/searchpaths.ui:27
 #, no-c-format
@@ -311,11 +319,14 @@ msgid ""
 "list of search paths.  If you have installed it elsewhere, you will need to "
 "add the correct path to the list below."
 msgstr ""
+"Kontrollcentermodulen kunde inte hitta GTK2-TQt-temamotorn i listan av "
+"sökvägar. Om du har installerat den någon annanstans behöver du lägga till "
+"den korrekta sökvägen i listan nedan."
 
 #: kcm_gtk/searchpaths.ui:122
 #, no-c-format
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #~ msgid "Firefox and Thunderbird"
 #~ msgstr "Firefox och Thunderbird"

translations/messages/zh_Hans.po

@@ -1,11 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # diaowinner <diaowinner@gmail.com>, 2023.
+# Toad114514 <xiaolan2332021@163.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2024-10-31 18:21+0000\n"
-"PO-Revision-Date: 2023-08-08 12:16+0000\n"
-"Last-Translator: diaowinner <diaowinner@gmail.com>\n"
+"PO-Revision-Date: 2025-04-24 16:44+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
 "Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
 "weblate/projects/applications/gtk-qt-engine/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -254,7 +255,7 @@ msgstr "使用其它字体："
 #: kcm_gtk/kcmgtkwidget.ui:494
 #, no-c-format
 msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
-msgstr "我能吞下玻璃而不伤身体。"
+msgstr "那只速度很快的棕色狐狸跳过了那只懒惰的狗"
 
 #: kcm_gtk/kcmgtkwidget.ui:504
 #, no-c-format