remove uneccesary variables/ui elements; deleteLater instead of delete

boardtabhelper.h

@@ -30,7 +30,6 @@ class BoardTabHelper : public QObject
 	QNetworkRequest request;
 	QWidget *parent;
 	QMetaObject::Connection connectionPost;
-	QThread *updateThread;
 	QMetaObject::Connection connectionUpdate;
 	QJsonArray filterThreads(QByteArray &rep);
 

threadform.cpp

@@ -117,8 +117,7 @@ void ThreadForm::load(QJsonObject &p)
 		connect(ui->tim,&ClickableLabel::clicked,this,&ThreadForm::imageClicked);
 	}
 	else{
-		delete ui->pictureLayout;
-		ui->contentLayout->layout()->takeAt(0);
+		ui->pictureLayout->deleteLater();
 		this->hasImage = false;
 	}
 }
@@ -415,9 +414,7 @@ ThreadForm *ThreadForm::clone(int replyLevel)
 		}
 	} else {
 		tfs->ui->pictureLayout->deleteLater();
-		tfs->ui->contentLayout->layout()->takeAt(0);
 		tfs->hasImage = false;
-		//tfs->ui->tim->deleteLater();
 	}
 	tfs->countryString = countryString;
 	if(repliesString.length()) {
@@ -547,8 +544,8 @@ void ThreadForm::on_com_linkHovered(const QString &link)
 
 void ThreadForm::deleteHideLayout()
 {
-	delete this->ui->hideLayout;
-	delete this->ui->quoteWidget;
+	ui->hideLayout->deleteLater();
+	ui->quoteWidget->deleteLater();
 	hideButtonShown = false;
 }
 

threadform.ui

@@ -214,33 +214,17 @@
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="contentLayout" stretch="0,0,0">
+      <layout class="QHBoxLayout" name="contentLayout" stretch="0,0">
        <property name="spacing">
         <number>0</number>
        </property>
-       <item>
-        <spacer name="picSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>8</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <layout class="QVBoxLayout" name="pictureLayout">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="leftMargin">
-          <number>5</number>
+          <number>13</number>
          </property>
          <property name="topMargin">
           <number>6</number>

threadtabhelper.cpp

@@ -26,7 +26,7 @@ void ThreadTabHelper::startUp(Chan *api, QString &board, QString &thread, QWidge
 	if(api->requiresUserAgent()) request.setHeader(QNetworkRequest::UserAgentHeader,api->requiredUserAgent());
 	request.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
 	getPosts();
-	updateTimer = new QTimer();
+	updateTimer = new QTimer(parent);
 	updateTimer->setInterval(60000);
 	updateTimer->start();
 	if(settings.value("autoUpdate").toBool()) {
@@ -39,7 +39,6 @@ ThreadTabHelper::~ThreadTabHelper() {
 	abort = true;
 	updateTimer->stop();
 	disconnect(connectionUpdate);
-	if(updateTimer) delete updateTimer;
 	if(gettingReply) {
 		reply->abort();
 		disconnect(reply);
@@ -122,8 +121,9 @@ void ThreadTabHelper::loadPosts() {
 		p = posts.at(i).toObject();
 		ThreadForm *tf = new ThreadForm(api,board,thread,PostType::Reply,true,loadFile,parent);
 		tf->load(p);
+		//TODO check post number without making the thread form?
 		if(tfMap.contains(tf->post.no)){
-			delete tf;
+			tf->deleteLater();
 			i++;
 			continue;
 		}

threadtabhelper.h

@@ -5,9 +5,7 @@
 #include "chans.h"
 #include <QNetworkReply>
 #include <QtConcurrent/QtConcurrent>
-#include <QFutureWatcher>
 #include <QImage>
-#include <QMetaObject>
 #include <QSettings>
 
 class ThreadTabHelper : public QObject
@@ -38,8 +36,7 @@ class ThreadTabHelper : public QObject
 	QNetworkRequest request;
 	QWidget *parent;
 	QMetaObject::Connection connectionPost;
-	QPointer<QTimer> updateTimer;
-	QThread *updateThread;
+	QTimer *updateTimer;
 	QMetaObject::Connection connectionUpdate;
 	bool isFromSession;