Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdecore/sonnet/enchantclient.cpp
View file

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

4
kdecore/sonnet/enchantdict.cpp
View file

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

2
kdecore/sonnet/enchantdict_p.h
View file

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

6
kdeui/tests/krichtexteditor/krichtexteditor.cpp
View file

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

2
kpty/kptydevice.cpp
View file

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