TDE
/
tellico
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tellico
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix build with KDE_DEFAULT_CXXFLAGS

Browse Source 
Fix FTBFS with GCC6

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 8 years ago
parent 0c697cf4f9
commit 5eb938208e
11 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
src/calendarhandler.cpp
Unescape View File

@ -228,7 +228,7 @@ void CalendarHandler::populateTodo(KCal::Todo* todo_, Data::LoanPtr loan_) {
TQString CalendarHandler::timezone() { TQString CalendarHandler::timezone() {
TQString zone; TQString zone;
TDEConfig korgcfg(locate(TQString::fromLatin1("config"), TQString::fromLatin1("korganizerrc"))); TDEConfig korgcfg(locate("config", TQString::fromLatin1("korganizerrc")));
korgcfg.setGroup("Time & Date"); korgcfg.setGroup("Time & Date");
TQString tz(korgcfg.readEntry("TimeZoneId")); TQString tz(korgcfg.readEntry("TimeZoneId"));
if(!tz.isEmpty()) { if(!tz.isEmpty()) {

4
src/cite/openoffice.cpp
Unescape View File

@ -87,7 +87,7 @@ bool OpenOffice::connect() {
d->port = config.readNumEntry("Port", 2083); d->port = config.readNumEntry("Port", 2083);
d->pipe = config.readPathEntry("Pipe"); d->pipe = config.readPathEntry("Pipe");
// the ooohandler will depend on pipe.isEmpty() to indicate the port should be used // the ooohandler will depend on pipe.isEmpty() to indicate the port should be used
d->handler->setHost(d->host); d->handler->setHost(d->host.ascii());
d->handler->setPort(d->port); d->handler->setPort(d->port);
if(!d->pipe.isEmpty()) { if(!d->pipe.isEmpty()) {
d->handler->setPipe(TQFile::encodeName(d->pipe)); d->handler->setPipe(TQFile::encodeName(d->pipe));
@ -246,7 +246,7 @@ bool OpenOffice::connectionDialog() {
d->pipe = s; d->pipe = s;
if(!d->host.isEmpty()) { if(!d->host.isEmpty()) {
d->handler->setHost(d->host); d->handler->setHost(d->host.ascii());
} }
d->handler->setPort(d->port); d->handler->setPort(d->port);
if(!d->pipe.isEmpty()) { if(!d->pipe.isEmpty()) {

2
src/fetch/z3950connection.cpp
Unescape View File

@ -22,11 +22,9 @@
#include <config.h> #include <config.h>
#ifdef HAVE_YAZ #ifdef HAVE_YAZ
extern "C" {
#include <yaz/zoom.h> #include <yaz/zoom.h>
#include <yaz/marcdisp.h> #include <yaz/marcdisp.h>
#include <yaz/yaz-version.h> #include <yaz/yaz-version.h>
}
#endif #endif
#include <tdelocale.h> #include <tdelocale.h>

2
src/filterdialog.cpp
Unescape View File

@ -113,7 +113,7 @@ void FilterRuleWidget::slotEditRegExp() {
TQString(), TQT_TQOBJECT(this)); TQString(), TQT_TQOBJECT(this));
} }
KRegExpEditorInterface* iface = static_cast<KRegExpEditorInterface *>(m_editRegExpDialog->tqt_cast(TQString::fromLatin1("KRegExpEditorInterface"))); KRegExpEditorInterface* iface = static_cast<KRegExpEditorInterface *>(m_editRegExpDialog->tqt_cast("KRegExpEditorInterface"));
if(iface) { if(iface) {
iface->setRegExp(m_ruleValue->text()); iface->setRegExp(m_ruleValue->text());
if(m_editRegExpDialog->exec() == TQDialog::Accepted) { if(m_editRegExpDialog->exec() == TQDialog::Accepted) {

2
src/gui/counteditem.cpp
Unescape View File

@ -57,7 +57,7 @@ void CountedItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
// but still benefit from TDEListView::paintCell // but still benefit from TDEListView::paintCell
TQString oldText = text(column_); TQString oldText = text(column_);
// if(oldText.isEmpty()) { // if(oldText.isEmpty()) {
if(oldText == '\t') { if(oldText == "\t") {
return; // avoid endless loop! return; // avoid endless loop!
} }

4
src/image.cpp
Unescape View File

@ -46,12 +46,12 @@ Image::Image(const TQString& filename_) : TQImage(filename_), m_linkOnly(false)
calculateID(); calculateID();
} }
Image::Image(const TQImage& img_, const TQString& format_) : TQImage(img_), m_format(format_), m_linkOnly(false) { Image::Image(const TQImage& img_, const TQString& format_) : TQImage(img_), m_format(format_.ascii()), m_linkOnly(false) {
calculateID(); calculateID();
} }
Image::Image(const TQByteArray& data_, const TQString& format_, const TQString& id_) Image::Image(const TQByteArray& data_, const TQString& format_, const TQString& id_)
: TQImage(data_), m_id(idClean(id_)), m_format(format_), m_linkOnly(false) { : TQImage(data_), m_id(idClean(id_)), m_format(format_.ascii()), m_linkOnly(false) {
if(isNull()) { if(isNull()) {
m_id = TQString(); m_id = TQString();
} }

2
src/mainwindow.cpp
Unescape View File

@ -2386,7 +2386,7 @@ bool MainWindow::importCollection(Data::CollPtr coll_, Import::Action action_) {
void MainWindow::slotURLAction(const KURL& url_) { void MainWindow::slotURLAction(const KURL& url_) {
Q_ASSERT(url_.protocol() == Latin1Literal("tc")); Q_ASSERT(url_.protocol() == Latin1Literal("tc"));
TQString actionName = url_.fileName(); TQString actionName = url_.fileName();
TDEAction* action = this->action(actionName); TDEAction* action = this->action(actionName.ascii());
if(action) { if(action) {
action->activate(); action->activate();
} else { } else {

2
src/reportdialog.cpp
Unescape View File

@ -105,7 +105,7 @@ ReportDialog::ReportDialog(TQWidget* parent_, const char* name_/*=0*/)
"margin:20% auto auto auto;text-align:center;" "margin:20% auto auto auto;text-align:center;"
"background:white;color:%1;}</style><body><p>").arg(contrastColor.name()) "background:white;color:%1;}</style><body><p>").arg(contrastColor.name())
+ i18n("Select a report template and click <em>Generate</em>.") + ' ' + i18n("Select a report template and click <em>Generate</em>.") + ' '
+ i18n("Some reports may take several seconds to generate for large collections."); + i18n("Some reports may take several seconds to generate for large collections.")
+ TQString::fromLatin1("</p></body></html>"); + TQString::fromLatin1("</p></body></html>");
m_HTMLPart->begin(); m_HTMLPart->begin();
m_HTMLPart->write(text); m_HTMLPart->write(text);

11
src/rtf2html/rtf2html.cpp
Unescape View File

@ -14,6 +14,12 @@
* * * *
***************************************************************************/ ***************************************************************************/
// force to use QT with STL
#if defined(QT_NO_STL)
# define DISABLE_QT_NO_STL
# undef QT_NO_STL
#endif
#include "rtf2html.h" #include "rtf2html.h"
#include "rtf_table.h" #include "rtf_table.h"
#include "rtf_tools.h" #include "rtf_tools.h"
@ -529,3 +535,8 @@ TQString RTF2HTML::toHTML() const {
return html; return html;
} }
// restore QT_NO_STL
#if defined(DISABLE_QT_NO_STL)
# undef DISABLE_QT_NO_STL
# define QT_NO_STL
#endif

2
src/translators/xsltexporter.cpp
Unescape View File

@ -47,7 +47,7 @@ TQString XSLTExporter::fileFilter() const {
bool XSLTExporter::exec() { bool XSLTExporter::exec() {
KURL u = m_URLRequester->url(); KURL u = m_URLRequester->url();
if(u.isEmpty() || !u.isValid()) { if(u.isEmpty() || !u.isValid()) {
return TQString(); return false;
} }
// XSLTHandler handler(FileHandler::readXMLFile(url)); // XSLTHandler handler(FileHandler::readXMLFile(url));
XSLTHandler handler(u); XSLTHandler handler(u);

2
src/translators/xslthandler.h
Unescape View File

@ -16,12 +16,10 @@
#include <tqmap.h> #include <tqmap.h>
extern "C" {
// for xmlDocPtr // for xmlDocPtr
#include <libxml/tree.h> #include <libxml/tree.h>
// for xsltStyleSheetPtr // for xsltStyleSheetPtr
#include <libxslt/xsltInternals.h> #include <libxslt/xsltInternals.h>
}
class KURL; class KURL;
class TQDomDocument; class TQDomDocument;

Write Preview
Loading…
Cancel
Save