TDE
/
tde-style-qtcurve
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-qtcurve
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS with stricter C++11.

Browse Source 
This also fixes the inability to translate the description
of file types used in KFileDialog calls.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/4/head
Slávek Banko 4 years ago
parent 13e18cc4cc
commit 0e4dbeb2ed
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

6
common/config_file.c
Unescape View File

@ -1608,7 +1608,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
TQString filename(TQFile::decodeName(cfgDir)+CONFIG_FILE); TQString filename(TQFile::decodeName(cfgDir)+CONFIG_FILE);
if(!TQFile::exists(filename)) if(!TQFile::exists(filename))
filename=TQFile::decodeName(cfgDir)+"../"OLD_CONFIG_FILE; filename=TQFile::decodeName(cfgDir)+"../"+OLD_CONFIG_FILE;
return readConfig(filename, opts, defOpts); return readConfig(filename, opts, defOpts);
} }
} }
@ -1631,7 +1631,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
sprintf(filename, "%s"CONFIG_FILE, cfgDir); sprintf(filename, "%s"CONFIG_FILE, cfgDir);
if(!qtcFileExists(filename)) if(!qtcFileExists(filename))
sprintf(filename, "%s../"OLD_CONFIG_FILE, cfgDir); sprintf(filename, "%s../" OLD_CONFIG_FILE, cfgDir);
rv=readConfig(filename, opts, defOpts); rv=readConfig(filename, opts, defOpts);
free(filename); free(filename);
return rv; return rv;
@ -2300,7 +2300,7 @@ static bool fileExists(const char *path)
static const char * getSystemConfigFile() static const char * getSystemConfigFile()
{ {
static const char * constFiles[]={ /*"/etc/qt4/"OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ "/etc/"OLD_CONFIG_FILE, NULL }; static const char * constFiles[]={ /*"/etc/qt4/" OLD_CONFIG_FILE, "/etc/qt3/" OLD_CONFIG_FILE, "/etc/qt/" OLD_CONFIG_FILE,*/ "/etc/" OLD_CONFIG_FILE, NULL };
int i; int i;

2
config/exportthemedialog.cpp
Unescape View File

@ -64,7 +64,7 @@ void CExportThemeDialog::slotOk()
KMessageBox::error(this, i18n("Name is empty!")); KMessageBox::error(this, i18n("Name is empty!"));
else else
{ {
TQString fileName(themeUrl->url()+"/"THEME_PREFIX+name+".themerc"); TQString fileName(themeUrl->url()+"/"+THEME_PREFIX+name+".themerc");
TDEConfig cfg(fileName, false, false); TDEConfig cfg(fileName, false, false);
bool rv(!cfg.isReadOnly()); bool rv(!cfg.isReadOnly());

12
config/qtcurveconfig.cpp
Unescape View File

@ -799,7 +799,7 @@ QtCurveConfig::~QtCurveConfig()
void QtCurveConfig::loadStyles(TQPopupMenu *menu) void QtCurveConfig::loadStyles(TQPopupMenu *menu)
{ {
TQStringList files(TDEGlobal::dirs()->findAllResources("data", "QtCurve/*"EXTENSION, false, true)); TQStringList files(TDEGlobal::dirs()->findAllResources("data", "QtCurve/*" EXTENSION, false, true));
files.sort(); files.sort();
@ -1374,9 +1374,11 @@ void QtCurveConfig::roundChanged()
void QtCurveConfig::importStyle() void QtCurveConfig::importStyle()
{ {
TQString file(KFileDialog::getOpenFileName(TQString::null, TQString file(KFileDialog::getOpenFileName(TQString::null,
i18n("*"EXTENSION"|QtCurve Settings Files\n" TQString("*%1|").arg(EXTENSION)+
THEME_PREFIX"*"THEME_SUFFIX"|QtCurve TDE Theme Files"), i18n("QtCurve Settings Files") + "\n" +
this)); TQString("%2*%3|").arg(THEME_PREFIX).arg(THEME_SUFFIX)+
i18n("QtCurve TDE Theme Files"),
this));
if(!file.isEmpty()) if(!file.isEmpty())
loadStyle(file); loadStyle(file);
@ -1384,7 +1386,7 @@ void QtCurveConfig::importStyle()
void QtCurveConfig::exportStyle() void QtCurveConfig::exportStyle()
{ {
TQString file(KFileDialog::getSaveFileName(TQString::null, i18n("*"EXTENSION"|QtCurve Settings Files"), this)); TQString file(KFileDialog::getSaveFileName(TQString::null, TQString("*%1|").arg(EXTENSION)+i18n("QtCurve Settings Files"), this));
if(!file.isEmpty()) if(!file.isEmpty())
{ {

Write Preview
Loading…
Cancel
Save