parent, pointer, and signal clean-ups

siavash119 · Jun 11, 2017 · 5e4328e · 5e4328e
1 parent 88e88ae
commit 5e4328e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -177,12 +177,11 @@ void MainWindow::loadFromSearch(QString searchString, bool select){
         return;
     }
     if(match2.hasMatch()){
-        bt = new BoardTab(match2.captured(1),BoardType::Catalog,match2.captured(2));
+        bt = new BoardTab(match2.captured(1),BoardType::Catalog,match2.captured(2),this);
         displayString = "/"+match2.captured(1)+"/"+match2.captured(2);
     }
     else{
-        //return;
-        bt = new BoardTab(searchString,BoardType::Index);
+        bt = new BoardTab(searchString,BoardType::Index,"",this);
         displayString = "/"+searchString+"/";
     }
     qDebug().noquote() << "loading " + displayString;
@@ -203,7 +202,7 @@ void MainWindow::loadFromSearch(QString searchString, bool select){
 void MainWindow::onNewThread(QWidget* parent, QString board, QString thread){
     (void)parent;
     qDebug().noquote()  << "loading /"+board+"/"+thread;
-    ThreadTab *tt = new ThreadTab(board,thread);
+    ThreadTab *tt = new ThreadTab(board,thread,this);
     //ui->verticalLayout_3->addWidget(tt);
     ui->stackedWidget->addWidget(tt);
     Tab tab = {Tab::TabType::Thread,tt,QString("/"+board+"/"+thread)};
@@ -223,13 +222,8 @@ void MainWindow::addTab(){
 
 void MainWindow::on_treeView_clicked(QModelIndex index)
 {
-    //model->findItems()
     int pageId = index.data(Qt::UserRole).toInt();
     ui->stackedWidget->setCurrentWidget(static_cast<QWidget*>(tabsNew.find(pageId)->TabPointer));
-    //qDebug() << index.internalPointer();
-    //ui->stackedWidget->setCurrentWidget(tabs.find(index.internalPointer()));
-    //ui->stackedWidget->setCurrentIndex(index.row());
-    //show_one(index);
 }
 
 void MainWindow::show_one(QModelIndex index){

diff --git a/threadform.cpp b/threadform.cpp
@@ -63,10 +63,6 @@ ThreadForm::~ThreadForm()
     if(gettingThumb)replyThumb->abort();
     //necessary because of the lambda functions?
     disconnect(&watcher);
-    disconnect(connectionThumb);
-    disconnect(connectionImage);
-    disconnect(ui->no);
-    disconnect(this);
     delete ui;
 }
 

diff --git a/threadtab.cpp b/threadtab.cpp
@@ -33,8 +33,7 @@ ThreadTab::ThreadTab(QString board, QString thread, QWidget *parent) :
     myPostForm.load(board,thread);
     this->setShortcuts();
     this->installEventFilter(this);
-    space = new QSpacerItem(0,0,QSizePolicy::Expanding,QSizePolicy::Expanding);
-    connect(mw,&MainWindow::setAutoUpdate,&helper,&ThreadTabHelper::setAutoUpdate,UniqueDirect);
+    connectionAutoUpdate = connect(mw,&MainWindow::setAutoUpdate,&helper,&ThreadTabHelper::setAutoUpdate,UniqueDirect);
     connect(&helper,&ThreadTabHelper::addStretch,this,&ThreadTab::addStretch,UniqueDirect);
     //connect(&helper,&ThreadTabHelper::refresh,[=](ThreadForm* tf){onRefresh(tf);});
 }
@@ -84,6 +83,7 @@ void ThreadTab::setShortcuts(){
 
 ThreadTab::~ThreadTab()
 {
+    ui->threads->removeItem(&space);
     QMutableMapIterator<QString,ThreadForm*> mapI(tfMap);
     while (mapI.hasNext()) {
         mapI.next();
@@ -93,6 +93,7 @@ ThreadTab::~ThreadTab()
     helper.abort = 1;
     workerThread.quit();
     workerThread.wait();
+    disconnect(connectionAutoUpdate);
     delete ui;
 }
 
@@ -114,8 +115,8 @@ void ThreadTab::gallery(){
 }
 
 void ThreadTab::addStretch(){
-    ui->threads->removeItem(space);
-    ui->threads->insertItem(-1,space);
+    ui->threads->removeItem(&space);
+    ui->threads->insertItem(-1,&space);
 }
 
 int ThreadTab::getMinWidth(){

diff --git a/threadtab.h b/threadtab.h
@@ -18,6 +18,7 @@ class ThreadTab : public QWidget
 {
     Q_OBJECT
     Qt::ConnectionType UniqueDirect = static_cast<Qt::ConnectionType>(Qt::DirectConnection | Qt::UniqueConnection);
+    QSpacerItem space = QSpacerItem(0,0,QSizePolicy::Expanding,QSizePolicy::Expanding);
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
 public:
@@ -27,7 +28,6 @@ class ThreadTab : public QWidget
     explicit ThreadTab(QString board, QString thread, QWidget *parent = 0);
     ~ThreadTab();
     QMap<QString,ThreadForm*> tfMap;
-    void addStretch();
     bool updated;
     void findText(const QString text);
     PostForm myPostForm;
@@ -41,6 +41,7 @@ class ThreadTab : public QWidget
     ThreadTabHelper helper;
 
 public slots:
+    void addStretch();
     void focusIt();
     void updateWidth();
     void quoteIt(QString text);
@@ -53,8 +54,8 @@ public slots:
 
 private:
     Ui::ThreadTab *ui;
+    QMetaObject::Connection connectionAutoUpdate;
     void setShortcuts();
-    QSpacerItem *space;
 
 private slots:
     void gallery();

diff --git a/threadtabhelper.h b/threadtabhelper.h
@@ -28,7 +28,6 @@ class ThreadTabHelper : public QObject
     //void startUp();
     void startUp(QString &board, QString &thread, QWidget* parent);
     static void writeJson(QString &board, QString &thread, QByteArray &rep);
-    void setAutoUpdate(bool update);
 
 private:
     QString threadUrl;
@@ -44,6 +43,7 @@ public slots:
     void loadPosts();
     void getPosts();
     void loadAllImages();
+    void setAutoUpdate(bool update);
 
 signals:
     void postsLoaded(QJsonArray &posts);