filebrowser-qt: Share settings and translations with GTK plugin

Author: radioactiveman

src/filebrowser-qt/Makefile

@@ -8,6 +8,6 @@ include ../../extra.mk
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 LD = ${CXX}
-CPPFLAGS += -I../.. ${QT_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../.. ${QT_CFLAGS}
 LIBS += ${QT_LIBS} -laudqt

src/filebrowser-qt/filebrowser-qt.cc

@@ -33,14 +33,15 @@
 #include <QToolButton>
 #include <QTreeView>
 
+#include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/playlist.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/plugins.h>
 #include <libaudcore/runtime.h>
 #include <libaudqt/libaudqt.h>
 
-#define CFG_ID "filebrowser-qt"
+#define CFG_ID "filebrowser"
 #define CFG_FILE_PATH "file_path"
 
 class FileBrowserQt : public GeneralPlugin
@@ -365,11 +366,13 @@ void FileBrowserWidget::setCurrentDirectory(const QString & path)
 
     QString dirName = info.baseName();
     QString cleanPath = m_fileSystemModel->rootDirectory().canonicalPath();
+    StringBuf text =
+        dirName.isEmpty()
+            ? str_copy(_("Search"))
+            : str_printf(_("Search in %s"), dirName.toUtf8().constData());
 
+    m_filterLineEdit->setPlaceholderText(QString(text));
     m_filterLineEdit->clear();
-    m_filterLineEdit->setPlaceholderText(
-        dirName.isEmpty() ? QString(_("Search"))
-                          : QString(_("Search in %1")).arg(dirName));
 
     aud_set_str(CFG_ID, CFG_FILE_PATH, cleanPath.toUtf8().constData());
 }