diff options
| author | 2015-10-18 05:16:18 -0400 | |
|---|---|---|
| committer | 2015-10-18 05:17:31 -0400 | |
| commit | e227679b0af3687acf9292953edbb0ebeab19df9 (patch) | |
| tree | b498cd485b2cf65cd6e4288ba75beb3ba6e89e02 /src/modules/objects | |
| parent | Merge pull request #1674 from un1versal/The-Emperor's-New-Clothes (diff) | |
| download | KVIrc-e227679b0af3687acf9292953edbb0ebeab19df9.tar.gz KVIrc-e227679b0af3687acf9292953edbb0ebeab19df9.tar.bz2 KVIrc-e227679b0af3687acf9292953edbb0ebeab19df9.zip | |
Clean up trailing whitespaces and excess newlines
Oh how I can already hear the sound of angry villagers
with pitchforks running over to my desk
Diffstat (limited to 'src/modules/objects')
50 files changed, 7 insertions, 95 deletions
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index 07a34e523..5e361415a 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -64,7 +64,7 @@ if(CMAKE_RESULT_USING_QT5) qtftp/qftp.cpp qtftp/qurlinfo.cpp ) - + include_directories(qthttp/) include_directories(qtftp/) endif() @@ -72,4 +72,3 @@ endif() set(kvi_module_name kviobjects) include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) - diff --git a/src/modules/objects/KvsObject_buttonGroup.h b/src/modules/objects/KvsObject_buttonGroup.h index a7d44cc91..772cada71 100644 --- a/src/modules/objects/KvsObject_buttonGroup.h +++ b/src/modules/objects/KvsObject_buttonGroup.h @@ -43,4 +43,3 @@ protected: }; #endif //!_CLASS_GROUPBOX_H_ - diff --git a/src/modules/objects/KvsObject_checkBox.cpp b/src/modules/objects/KvsObject_checkBox.cpp index 73009a2f9..1a90aa19e 100644 --- a/src/modules/objects/KvsObject_checkBox.cpp +++ b/src/modules/objects/KvsObject_checkBox.cpp @@ -129,6 +129,3 @@ void KvsObject_checkBox::toggled(bool b) KviKvsVariantList params(new KviKvsVariant(b)); callFunction(this,"toggleEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp index 2d87bd0ba..2aea899f6 100644 --- a/src/modules/objects/KvsObject_colorDialog.cpp +++ b/src/modules/objects/KvsObject_colorDialog.cpp @@ -229,6 +229,3 @@ void KvsObject_colorDialog::slotColorSelected(const QColor &col) KviKvsVariantList params(new KviKvsVariant(pHash)); callFunction(this,"colorSelectedEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp index e712f0bb5..5fe40c13d 100644 --- a/src/modules/objects/KvsObject_comboBox.cpp +++ b/src/modules/objects/KvsObject_comboBox.cpp @@ -358,6 +358,3 @@ void KvsObject_comboBox::slotActivated(int i) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i)); callFunction(this,"activatedEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp index eaa2be091..bd4b4b259 100644 --- a/src/modules/objects/KvsObject_dateTimeEdit.cpp +++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp @@ -207,5 +207,3 @@ void KvsObject_dateTimeEdit::slotDateChanged(const QDate &) KviKvsVariantList *params=0; callFunction(this,"dateChangedEvent",params); } - - diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp index 8b5d30b27..2d56405cd 100644 --- a/src/modules/objects/KvsObject_dialog.cpp +++ b/src/modules/objects/KvsObject_dialog.cpp @@ -87,5 +87,3 @@ KVSO_CLASS_FUNCTION(dialog,setModal) ((QDialog *)widget())->setModal(bEnabled); return true; } - - diff --git a/src/modules/objects/KvsObject_dialog.h b/src/modules/objects/KvsObject_dialog.h index 602de8756..4dc08a8b2 100644 --- a/src/modules/objects/KvsObject_dialog.h +++ b/src/modules/objects/KvsObject_dialog.h @@ -40,4 +40,3 @@ protected: }; #endif // !_CLASS_DIALOG_H_ - diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp index b8cc20676..6a3628856 100644 --- a/src/modules/objects/KvsObject_dockWindow.cpp +++ b/src/modules/objects/KvsObject_dockWindow.cpp @@ -174,5 +174,3 @@ KVSO_CLASS_FUNCTION(dockWindow,dock) else c->warning(__tr2qs_ctx("Invalid dock area specified","objects")); return true; } - - diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp index 2b099afc3..da093e1fc 100644 --- a/src/modules/objects/KvsObject_ftp.cpp +++ b/src/modules/objects/KvsObject_ftp.cpp @@ -336,5 +336,3 @@ KVSO_CLASS_FUNCTION(ftp,stateChangedEvent) emitSignal("stateChanged",c,c->params()); return true; } - - diff --git a/src/modules/objects/KvsObject_groupBox.h b/src/modules/objects/KvsObject_groupBox.h index 4770352a9..7c30705da 100644 --- a/src/modules/objects/KvsObject_groupBox.h +++ b/src/modules/objects/KvsObject_groupBox.h @@ -60,4 +60,3 @@ protected: }; #endif //!_CLASS_GROUPBOX_H_ - diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp index b64020ff8..a969a5baf 100644 --- a/src/modules/objects/KvsObject_http.cpp +++ b/src/modules/objects/KvsObject_http.cpp @@ -563,4 +563,3 @@ bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c) return true; } #endif - diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp index d59e18921..b0d01c6bf 100644 --- a/src/modules/objects/KvsObject_lineEdit.cpp +++ b/src/modules/objects/KvsObject_lineEdit.cpp @@ -532,7 +532,3 @@ void KvsObject_lineEdit::slottextChanged(const QString &text) KviKvsVariantList params(new KviKvsVariant(text)); callFunction(this,"textChangedEvent",¶ms); } - - - - diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp index bd187f226..5c5fa171c 100644 --- a/src/modules/objects/KvsObject_list.cpp +++ b/src/modules/objects/KvsObject_list.cpp @@ -339,4 +339,3 @@ KVSO_CLASS_FUNCTION(list,count) c->returnValue()->setInteger(m_pDataList->count()); return true; } - diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp index 6dba669c8..e630b2f53 100644 --- a/src/modules/objects/KvsObject_listWidget.cpp +++ b/src/modules/objects/KvsObject_listWidget.cpp @@ -673,5 +673,3 @@ void KvsObject_listWidget::slotItemChanged(QListWidgetItem *item) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item))); callFunction(this,"itemChangedEvent",0,¶ms); } - - diff --git a/src/modules/objects/KvsObject_mainWindow.cpp b/src/modules/objects/KvsObject_mainWindow.cpp index 8f9d62a45..1de990a9f 100644 --- a/src/modules/objects/KvsObject_mainWindow.cpp +++ b/src/modules/objects/KvsObject_mainWindow.cpp @@ -98,4 +98,3 @@ KVSO_CLASS_FUNCTION(mainWindow,setCentralWidget) ((KviTalMainWindow *)widget())->setCentralWidget(((QWidget *)(pObject->object()))); return true; } - diff --git a/src/modules/objects/KvsObject_mainWindow.h b/src/modules/objects/KvsObject_mainWindow.h index 11ad34645..f7dd41470 100644 --- a/src/modules/objects/KvsObject_mainWindow.h +++ b/src/modules/objects/KvsObject_mainWindow.h @@ -43,4 +43,3 @@ protected: #endif //!_CLASS_MAINWINDOW_H_ - diff --git a/src/modules/objects/KvsObject_memoryBuffer.cpp b/src/modules/objects/KvsObject_memoryBuffer.cpp index b960573f4..056c314ae 100644 --- a/src/modules/objects/KvsObject_memoryBuffer.cpp +++ b/src/modules/objects/KvsObject_memoryBuffer.cpp @@ -154,7 +154,3 @@ KVSO_CLASS_FUNCTION(memoryBuffer,saveToFile) } return true; } - - - - diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp index 5c026c661..1cd5963d1 100644 --- a/src/modules/objects/KvsObject_multiLineEdit.cpp +++ b/src/modules/objects/KvsObject_multiLineEdit.cpp @@ -783,5 +783,3 @@ bool KvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *) ((QTextEdit *)widget())->selectAll(); return true; } - - diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp index 72124d318..bedf4f109 100644 --- a/src/modules/objects/KvsObject_painter.cpp +++ b/src/modules/objects/KvsObject_painter.cpp @@ -2097,4 +2097,3 @@ void KvsObject_painter::setInternalPainter(QPainter *p) m_pPainter=p; bDonotdeleteinternalqpainter=true; } - diff --git a/src/modules/objects/KvsObject_painter.h b/src/modules/objects/KvsObject_painter.h index 33b131176..f63b5638e 100644 --- a/src/modules/objects/KvsObject_painter.h +++ b/src/modules/objects/KvsObject_painter.h @@ -129,6 +129,3 @@ private: KviKvsObject * m_pDeviceObject; }; #endif // !_CLASS_PAINTER_H_ - - - diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index 55bf48f40..5d0f468a2 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -706,5 +706,3 @@ void KvsObject_pixmap::frameChanged() KviKvsVariantList *params=0; callFunction(this,"frameChangedEvent",params); } - - diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp index 291b39a90..c884c35de 100644 --- a/src/modules/objects/KvsObject_popupMenu.cpp +++ b/src/modules/objects/KvsObject_popupMenu.cpp @@ -420,5 +420,3 @@ KVSO_CLASS_FUNCTION(popupMenu,activatedEvent) emitSignal("activated",c,c->params()); return true; } - - diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h index ad0fc37c7..385e57f75 100644 --- a/src/modules/objects/KvsObject_popupMenu.h +++ b/src/modules/objects/KvsObject_popupMenu.h @@ -61,4 +61,3 @@ protected slots: }; #endif // !_CLASS_POPUPMENU_H_ - diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp index 4fd235ee7..d16d9af86 100644 --- a/src/modules/objects/KvsObject_process.cpp +++ b/src/modules/objects/KvsObject_process.cpp @@ -316,5 +316,3 @@ void KvsObject_process::slotReadStderr() KviKvsVariantList *params=0; callFunction(this,"readyReadStderrEvent",params); } - - diff --git a/src/modules/objects/KvsObject_progressBar.cpp b/src/modules/objects/KvsObject_progressBar.cpp index 294bcc866..d86f598dc 100644 --- a/src/modules/objects/KvsObject_progressBar.cpp +++ b/src/modules/objects/KvsObject_progressBar.cpp @@ -146,5 +146,3 @@ KVSO_CLASS_FUNCTION(progressBar,percentageVisible) c->returnValue()->setBoolean(((QProgressBar *)widget())->isTextVisible()); return true; } - - diff --git a/src/modules/objects/KvsObject_progressBar.h b/src/modules/objects/KvsObject_progressBar.h index 9b27177e1..c50cf1a04 100644 --- a/src/modules/objects/KvsObject_progressBar.h +++ b/src/modules/objects/KvsObject_progressBar.h @@ -48,4 +48,3 @@ protected: #endif //!_CLASS_PROGRESSBAR_H_ - diff --git a/src/modules/objects/KvsObject_radioButton.cpp b/src/modules/objects/KvsObject_radioButton.cpp index 7d614fa96..fc09fd3b4 100644 --- a/src/modules/objects/KvsObject_radioButton.cpp +++ b/src/modules/objects/KvsObject_radioButton.cpp @@ -138,6 +138,3 @@ void KvsObject_radioButton::toggled(bool b) KviKvsVariantList params(new KviKvsVariant(b)); callFunction(this,"toggleEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_slider.cpp b/src/modules/objects/KvsObject_slider.cpp index 4737818a7..3cd3cbc30 100644 --- a/src/modules/objects/KvsObject_slider.cpp +++ b/src/modules/objects/KvsObject_slider.cpp @@ -293,6 +293,3 @@ void KvsObject_slider::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - - - diff --git a/src/modules/objects/KvsObject_slider.h b/src/modules/objects/KvsObject_slider.h index 7474d0db0..628eb1ae9 100644 --- a/src/modules/objects/KvsObject_slider.h +++ b/src/modules/objects/KvsObject_slider.h @@ -61,4 +61,3 @@ protected slots: #endif // !_CLASS_SLIDER_H_ - diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp index 98cb3d217..c1c0def2b 100644 --- a/src/modules/objects/KvsObject_socket.cpp +++ b/src/modules/objects/KvsObject_socket.cpp @@ -746,4 +746,3 @@ KVSO_CLASS_FUNCTION(socket,stateChangedEvent) emitSignal("stateChanged",c,c->params()); return true; } - diff --git a/src/modules/objects/KvsObject_spinBox.cpp b/src/modules/objects/KvsObject_spinBox.cpp index 4c64364dc..8603e524a 100644 --- a/src/modules/objects/KvsObject_spinBox.cpp +++ b/src/modules/objects/KvsObject_spinBox.cpp @@ -260,5 +260,3 @@ void KvsObject_spinBox::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - - diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp index d8e6dc851..225b5de2f 100644 --- a/src/modules/objects/KvsObject_sql.cpp +++ b/src/modules/objects/KvsObject_sql.cpp @@ -483,5 +483,3 @@ KVSO_CLASS_FUNCTION(sql,lastError) c->returnValue()->setString(szError); return true; } - - diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp index 860d34661..63e38ca05 100644 --- a/src/modules/objects/KvsObject_tabWidget.cpp +++ b/src/modules/objects/KvsObject_tabWidget.cpp @@ -473,4 +473,3 @@ void KvsObject_tabWidget::slotTabCloseRequest(int iIndex) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iIndex)); callFunction(this,"tabCloseRequestEvent",¶ms); } - diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp index 796d94694..c66c82cdd 100644 --- a/src/modules/objects/KvsObject_tableWidget.cpp +++ b/src/modules/objects/KvsObject_tableWidget.cpp @@ -891,6 +891,3 @@ QSize KviCellItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QM } return QItemDelegate::sizeHint(option,index); } - - - diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp index 640a3dc58..59092a124 100644 --- a/src/modules/objects/KvsObject_textBrowser.cpp +++ b/src/modules/objects/KvsObject_textBrowser.cpp @@ -148,5 +148,3 @@ KVSO_CLASS_FUNCTION(textBrowser,linkClickedEvent) emitSignal("linkClicked",c,c->params()); return true; } - - diff --git a/src/modules/objects/KvsObject_toolBar.cpp b/src/modules/objects/KvsObject_toolBar.cpp index 1b3367aa5..93c8424c1 100644 --- a/src/modules/objects/KvsObject_toolBar.cpp +++ b/src/modules/objects/KvsObject_toolBar.cpp @@ -111,6 +111,3 @@ KVSO_CLASS_FUNCTION(toolBar,clear) ((QToolBar *)object())->clear(); return true; } - - - diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp index eba314778..421a80278 100644 --- a/src/modules/objects/KvsObject_toolButton.cpp +++ b/src/modules/objects/KvsObject_toolButton.cpp @@ -339,5 +339,3 @@ void KvsObject_toolButton::slotClicked() KviKvsVariantList *params=0; callFunction(this,"clickEvent",params); } - - diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp index dfb8fc01b..fb32adbe3 100644 --- a/src/modules/objects/KvsObject_treeWidget.cpp +++ b/src/modules/objects/KvsObject_treeWidget.cpp @@ -654,4 +654,3 @@ void KviKvsTreeWidget::dropEvent(QDropEvent * e) } } } - diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp index 5c8e08b85..1ef7704ce 100644 --- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp +++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp @@ -427,4 +427,3 @@ KVSO_CLASS_FUNCTION(treeWidgetItem,setPixmap) m_pTreeWidgetItem->setIcon(uCol,QIcon(*pix)); return true; } - diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp index 875daddf6..cf52189a5 100644 --- a/src/modules/objects/KvsObject_vBox.cpp +++ b/src/modules/objects/KvsObject_vBox.cpp @@ -207,4 +207,3 @@ KVSO_CLASS_FUNCTION(vBox,setAlignment) if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; } - diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index 977850d61..9f1fbb6dc 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -2036,6 +2036,3 @@ KVSO_CLASS_FUNCTION(widget,grab) c->returnValue()->setHObject(pObject->handle()); return true; } - - - diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp index 2e8b7bd67..ea0b26ba4 100644 --- a/src/modules/objects/KvsObject_window.cpp +++ b/src/modules/objects/KvsObject_window.cpp @@ -171,5 +171,3 @@ KVSO_CLASS_FUNCTION(window,setCentralWidget) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KvsObject_widget *)ob,((KvsObject_widget *)ob)->widget()); return true; } - - diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp index 8cfe44a25..f8e69fadf 100644 --- a/src/modules/objects/KvsObject_wizard.cpp +++ b/src/modules/objects/KvsObject_wizard.cpp @@ -379,5 +379,3 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } - - diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp index f46559936..349802bd5 100644 --- a/src/modules/objects/KvsObject_workspace.cpp +++ b/src/modules/objects/KvsObject_workspace.cpp @@ -333,4 +333,3 @@ KVSO_CLASS_FUNCTION(workspace,setscrollBarsEnabled) } return true; } - diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp index 16d036669..43f297e8a 100644 --- a/src/modules/objects/KvsObject_wrapper.cpp +++ b/src/modules/objects/KvsObject_wrapper.cpp @@ -261,7 +261,7 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pContext->warning(__tr2qs_ctx("The '!Parent' specifier can't be used as first in the search path","objects")); return false; } - + int iLevels = 1; if(!szName.isEmpty()) { @@ -277,7 +277,7 @@ bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * while(iLevels > 0) { pWidget = pWidget->parentWidget(); - + if(!pWidget) { pContext->warning(__tr2qs_ctx("The '!Parent' specifier was applied to a widget that has no parent","objects")); @@ -340,7 +340,7 @@ QWidget * KvsObject_wrapper::findTopLevelWidgetToWrap(const QString &szClass,con return w; } } - + return NULL; } diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp index f0f05528d..1111a18f7 100644 --- a/src/modules/objects/KvsObject_xmlreader.cpp +++ b/src/modules/objects/KvsObject_xmlreader.cpp @@ -369,5 +369,3 @@ KVSO_CLASS_FUNCTION(xmlReader,lastError) c->returnValue()->setString(m_szLastError); return true; } - - diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index b12ed3f3a..9fe7ae018 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -121,4 +121,3 @@ if (!__pObject)\ return true;\ } #endif - diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp index 5bffb3b4d..33b885580 100644 --- a/src/modules/objects/qthttp/qhttp.cpp +++ b/src/modules/objects/qthttp/qhttp.cpp @@ -2155,7 +2155,7 @@ int QHttp::setUser(const QString &userName, const QString &password) proxying, such as SOCKS5, use QNetworkProxy instead. \note setProxy() has to be called before setHost() for it to take effect. - If setProxy() is called after setHost(), then it will not apply until after + If setProxy() is called after setHost(), then it will not apply until after setHost() is called again. \sa QFtp::setProxy() @@ -2853,7 +2853,7 @@ void QHttpPrivate::_q_slotReadyRead() if (response.statusCode() == 100 && pendingPost) { // if we have pending POST, start sending data otherwise ignore post100ContinueTimer.stop(); - QMetaObject::invokeMethod(q, "_q_continuePost", Qt::QueuedConnection); + QMetaObject::invokeMethod(q, "_q_continuePost", Qt::QueuedConnection); return; } diff --git a/src/modules/objects/qthttp/qringbuffer_p.h b/src/modules/objects/qthttp/qringbuffer_p.h index 72a9f0ec2..ff762fab2 100644 --- a/src/modules/objects/qthttp/qringbuffer_p.h +++ b/src/modules/objects/qthttp/qringbuffer_p.h @@ -373,7 +373,7 @@ public: --tailBuffer; } bufferSize -= qba.length(); - return qba; + return qba; } // append a new buffer to the end |
