Merge msvc fixes from stable branch

This commit is contained in:
Christophe Dumez 2010-06-05 18:59:05 +00:00
parent 682377ff66
commit 8ec1621334
13 changed files with 87 additions and 51 deletions

View file

@ -251,13 +251,12 @@ void RSSImp::deleteSelectedItems() {
void RSSImp::loadFoldersOpenState() {
QSettings settings("qBittorrent", "qBittorrent");
settings.beginGroup("Rss");
QVariantList open_folders = settings.value("open_folders", QVariantList()).toList();
QStringList open_folders = settings.value("open_folders", QStringList()).toStringList();
settings.endGroup();
foreach(QVariant var_path, open_folders) {
QStringList path = var_path.toString().split("\\");
foreach(QString var_path, open_folders) {
QStringList path = var_path.split("\\");
QTreeWidgetItem *parent = 0;
foreach(QString name, path) {
QList<QTreeWidgetItem*> children;
int nbChildren = 0;
if(parent)
nbChildren = parent->childCount();
@ -281,7 +280,7 @@ void RSSImp::loadFoldersOpenState() {
}
void RSSImp::saveFoldersOpenState() {
QVariantList open_folders;
QStringList open_folders;
QList<QTreeWidgetItem*> items = listStreams->getAllOpenFolders();
foreach(QTreeWidgetItem* item, items) {
QString path = listStreams->getItemPath(item).join("\\");