diff --git a/kdecore/sonnet/enchantclient.cpp b/kdecore/sonnet/enchantclient.cpp index fac8a3c1..7fc4905d 100644 --- a/kdecore/sonnet/enchantclient.cpp +++ b/kdecore/sonnet/enchantclient.cpp @@ -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); } } diff --git a/kdecore/sonnet/enchantdict.cpp b/kdecore/sonnet/enchantdict.cpp index 0f68595f..83f95be2 100644 --- a/kdecore/sonnet/enchantdict.cpp +++ b/kdecore/sonnet/enchantdict.cpp @@ -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) { } diff --git a/kdecore/sonnet/enchantdict_p.h b/kdecore/sonnet/enchantdict_p.h index 433c245a..50d4e2bb 100644 --- a/kdecore/sonnet/enchantdict_p.h +++ b/kdecore/sonnet/enchantdict_p.h @@ -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; diff --git a/kdeui/tests/krichtexteditor/krichtexteditor.cpp b/kdeui/tests/krichtexteditor/krichtexteditor.cpp index c3c8c8dc..7b252183 100644 --- a/kdeui/tests/krichtexteditor/krichtexteditor.cpp +++ b/kdeui/tests/krichtexteditor/krichtexteditor.cpp @@ -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()); } } diff --git a/kpty/kptydevice.cpp b/kpty/kptydevice.cpp index 5c07b36e..229b3de9 100644 --- a/kpty/kptydevice.cpp +++ b/kpty/kptydevice.cpp @@ -44,7 +44,7 @@ # include #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)