Fixed Qt runtime warnings
FossilOrigin-Name: 8e08f86043f0c2159037824f125e6acf2c2be007
This commit is contained in:
parent
9c4e8d4248
commit
b25efbddd1
@ -111,15 +111,14 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
ui->tableView->addAction(ui->actionDelete);
|
ui->tableView->addAction(ui->actionDelete);
|
||||||
connect( ui->tableView,
|
connect( ui->tableView,
|
||||||
SIGNAL( dragOutEvent() ),
|
SIGNAL( dragOutEvent() ),
|
||||||
SLOT( on_fileView_dragOut() ),
|
SLOT( onFileViewDragOut() ),
|
||||||
Qt::DirectConnection );
|
Qt::DirectConnection );
|
||||||
|
|
||||||
|
|
||||||
// TreeView
|
// TreeView
|
||||||
ui->treeView->setModel(&repoDirModel);
|
ui->treeView->setModel(&repoDirModel);
|
||||||
connect( ui->treeView->selectionModel(),
|
connect( ui->treeView->selectionModel(),
|
||||||
SIGNAL( selectionChanged(const QItemSelection &, const QItemSelection &) ),
|
SIGNAL( selectionChanged(const QItemSelection &, const QItemSelection &) ),
|
||||||
SLOT( on_treeView_selectionChanged(const QItemSelection &, const QItemSelection &) ),
|
SLOT( onTreeViewSelectionChanged(const QItemSelection &, const QItemSelection &) ),
|
||||||
Qt::DirectConnection );
|
Qt::DirectConnection );
|
||||||
|
|
||||||
ui->treeView->addAction(ui->actionCommit);
|
ui->treeView->addAction(ui->actionCommit);
|
||||||
@ -155,7 +154,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
{
|
{
|
||||||
recentWorkspaceActs[i] = new QAction(this);
|
recentWorkspaceActs[i] = new QAction(this);
|
||||||
recentWorkspaceActs[i]->setVisible(false);
|
recentWorkspaceActs[i]->setVisible(false);
|
||||||
connect(recentWorkspaceActs[i], SIGNAL(triggered()), this, SLOT(on_openRecent()));
|
connect(recentWorkspaceActs[i], SIGNAL(triggered()), this, SLOT(onOpenRecent()));
|
||||||
ui->menuFile->insertAction(recent_sep, recentWorkspaceActs[i]);
|
ui->menuFile->insertAction(recent_sep, recentWorkspaceActs[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -397,7 +396,7 @@ void MainWindow::on_actionCloseRepository_triggered()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_actionClone_triggered()
|
void MainWindow::on_actionCloneRepository_triggered()
|
||||||
{
|
{
|
||||||
// FIXME: Implement this
|
// FIXME: Implement this
|
||||||
stopUI();
|
stopUI();
|
||||||
@ -423,7 +422,7 @@ void MainWindow::rebuildRecent()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_openRecent()
|
void MainWindow::onOpenRecent()
|
||||||
{
|
{
|
||||||
QAction *action = qobject_cast<QAction *>(sender());
|
QAction *action = qobject_cast<QAction *>(sender());
|
||||||
if(!action)
|
if(!action)
|
||||||
@ -1952,7 +1951,7 @@ QString MainWindow::getFossilHttpAddress()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_treeView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)
|
void MainWindow::onTreeViewSelectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)
|
||||||
{
|
{
|
||||||
selectedDirs.clear();
|
selectedDirs.clear();
|
||||||
|
|
||||||
@ -2293,7 +2292,7 @@ void MainWindow::on_actionDiffStash_triggered()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
void MainWindow::on_fileView_dragOut()
|
void MainWindow::onFileViewDragOut()
|
||||||
{
|
{
|
||||||
QStringList filenames;
|
QStringList filenames;
|
||||||
getFileViewSelection(filenames);
|
getFileViewSelection(filenames);
|
||||||
|
11
MainWindow.h
11
MainWindow.h
@ -181,10 +181,11 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
// Manual slots
|
// Manual slots.
|
||||||
void on_openRecent();
|
// Use a different naming scheme to prevent warnings from Qt's automatic signaling
|
||||||
void on_treeView_selectionChanged(const class QItemSelection &selected, const class QItemSelection &deselected);
|
void onOpenRecent();
|
||||||
void on_fileView_dragOut();
|
void onTreeViewSelectionChanged(const class QItemSelection &selected, const class QItemSelection &deselected);
|
||||||
|
void onFileViewDragOut();
|
||||||
|
|
||||||
// Designer slots
|
// Designer slots
|
||||||
void on_actionRefresh_triggered();
|
void on_actionRefresh_triggered();
|
||||||
@ -203,7 +204,6 @@ private slots:
|
|||||||
void on_actionAdd_triggered();
|
void on_actionAdd_triggered();
|
||||||
void on_actionDelete_triggered();
|
void on_actionDelete_triggered();
|
||||||
void on_actionRevert_triggered();
|
void on_actionRevert_triggered();
|
||||||
void on_actionClone_triggered();
|
|
||||||
void on_actionOpenContaining_triggered();
|
void on_actionOpenContaining_triggered();
|
||||||
void on_actionRename_triggered();
|
void on_actionRename_triggered();
|
||||||
void on_actionUndo_triggered();
|
void on_actionUndo_triggered();
|
||||||
@ -220,6 +220,7 @@ private slots:
|
|||||||
void on_actionNewRepository_triggered();
|
void on_actionNewRepository_triggered();
|
||||||
void on_actionOpenRepository_triggered();
|
void on_actionOpenRepository_triggered();
|
||||||
void on_actionCloseRepository_triggered();
|
void on_actionCloseRepository_triggered();
|
||||||
|
void on_actionCloneRepository_triggered();
|
||||||
void on_actionViewStash_triggered();
|
void on_actionViewStash_triggered();
|
||||||
void on_actionNewStash_triggered();
|
void on_actionNewStash_triggered();
|
||||||
void on_actionApplyStash_triggered();
|
void on_actionApplyStash_triggered();
|
||||||
|
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
|||||||
C Enabled\sthe\sheader\sin\sthe\streeview
|
C Fixed\sQt\sruntime\swarnings
|
||||||
D 2012-04-15T12:38:54.955
|
D 2012-04-15T13:01:27.517
|
||||||
F CommitDialog.cpp a46020a9361151d8d286a2670257d01d8967bf69
|
F CommitDialog.cpp a46020a9361151d8d286a2670257d01d8967bf69
|
||||||
F CommitDialog.h f1ee8db92103164e7db55a8407ccdcff24571b72
|
F CommitDialog.h f1ee8db92103164e7db55a8407ccdcff24571b72
|
||||||
F CommitDialog.ui 813d7cba316e226de1a22b7e480bb969fbe9b0c4
|
F CommitDialog.ui 813d7cba316e226de1a22b7e480bb969fbe9b0c4
|
||||||
@ -8,8 +8,8 @@ F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
|
|||||||
F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
|
F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
|
||||||
F FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
|
F FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
|
||||||
F FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
|
F FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
|
||||||
F MainWindow.cpp e6a73e167787a2effee2c437541f1f9f744667cc
|
F MainWindow.cpp 328041680fdba0c8076393bd58a2946489aee945
|
||||||
F MainWindow.h 987fa4ae0604373778184501f4f71f07ac614a16
|
F MainWindow.h 1b45fba850a0a1da654f73ee47ba20c7802005d8
|
||||||
F MainWindow.ui d569997fecf4a22d61a016a4a23eea04eaad6dee
|
F MainWindow.ui d569997fecf4a22d61a016a4a23eea04eaad6dee
|
||||||
F SettingsDialog.cpp e1fad18cc020d08b82c6d35dc94f6624deec9a3b
|
F SettingsDialog.cpp e1fad18cc020d08b82c6d35dc94f6624deec9a3b
|
||||||
F SettingsDialog.h f5da6cab4ccc82e2eb78ec835fb849c4c104d6cc
|
F SettingsDialog.h f5da6cab4ccc82e2eb78ec835fb849c4c104d6cc
|
||||||
@ -176,7 +176,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214
|
|||||||
F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
|
F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
|
||||||
F main.cpp 708e816c839ff4d9af9b769ac917a3fffe2c87c3
|
F main.cpp 708e816c839ff4d9af9b769ac917a3fffe2c87c3
|
||||||
F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
|
F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
|
||||||
P 8814626a6033ff2729ea9643bb969ad4f3baa88c
|
P 689410ce4a8504ffc6b0a92e8faef8df5df1131c
|
||||||
R 8c89c93ae408915f3c188da9f6bd3bde
|
R 45f82ac60fc0148d6bb76bc7e3806b1f
|
||||||
U kostas
|
U kostas
|
||||||
Z f2c5008db068453855c823727dcf2740
|
Z dbe672564b67fcf89fa31f8b55a47c06
|
||||||
|
@ -1 +1 @@
|
|||||||
689410ce4a8504ffc6b0a92e8faef8df5df1131c
|
8e08f86043f0c2159037824f125e6acf2c2be007
|
Loading…
x
Reference in New Issue
Block a user