generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-09-30 23:38:25 +00:00
parent 3e06b05004
commit bbc0b5a3f8
5 changed files with 5 additions and 11 deletions

View file

@ -71,7 +71,7 @@ QSpellEnchantDict *QSpellEnchantClient::createSpeller(
int refs = m_dictRefs[dict];
++refs;
m_dictRefs[dict] = refs;
return new QSpellEnchantDict(this, m_broker, dict, language);
return new QSpellEnchantDict(this, dict, language);
}
}

View file

@ -27,11 +27,9 @@ namespace Sonnet
{
QSpellEnchantDict::QSpellEnchantDict(QSpellEnchantClient *client,
EnchantBroker *broker,
EnchantDict *dict,
const QString &language)
: m_broker(broker),
m_dict(dict),
: m_dict(dict),
m_client(client)
{
}

View file

@ -49,12 +49,10 @@ namespace Sonnet
friend class QSpellEnchantClient;
QSpellEnchantDict(const QString &lang);
QSpellEnchantDict(QSpellEnchantClient *client,
EnchantBroker *broker,
EnchantDict *dict,
const QString &language);
private:
EnchantBroker *m_broker;
EnchantDict *m_dict;
QSpellEnchantClient *m_client;
QString m_language;

View file

@ -128,8 +128,7 @@ void KRichTextEditor::openFile()
}
QString tmpFile;
if (KIO::NetAccess::download(fileNameFromDialog, tmpFile,
this)) {
if (KIO::NetAccess::download(fileNameFromDialog, tmpFile, this)) {
QFile file(tmpFile);
file.open(QIODevice::ReadOnly);
textArea->setTextOrHtml(QTextStream(&file).readAll());
@ -137,7 +136,6 @@ void KRichTextEditor::openFile()
KIO::NetAccess::removeTempFile(tmpFile);
} else {
KMessageBox::error(this,
KIO::NetAccess::lastErrorString());
KMessageBox::error(this, KIO::NetAccess::lastErrorString());
}
}

View file

@ -44,7 +44,7 @@
# include <sys/time.h>
#endif
#if defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
#if defined(Q_OS_FREEBSD)
// "the other end's output queue size" - kinda braindead, huh?
# define PTY_BYTES_AVAILABLE TIOCOUTQ
#elif defined(TIOCINQ)