Re: [developerteam getadooble] SF.net SVN: dooble:[2468] trunk/browser/Source
Brought to you by:
textfield
From: A. M. <tex...@gm...> - 2011-07-07 21:15:25
|
Coolio!!! This is not portability. This breaks all systems where multiple users are supported. Windows supports multiple users!!! That's it. Access denied. On Thu, Jul 7, 2011 at 4:45 PM, <plu...@us...> wrote: > Revision: 2468 > http://dooble.svn.sourceforge.net/dooble/?rev=2468&view=rev > Author: plugin524 > Date: 2011-07-07 20:45:34 +0000 (Thu, 07 Jul 2011) > > Log Message: > ----------- > windows version made portable. > > Modified Paths: > -------------- > trunk/browser/Source/dcookies.cc > trunk/browser/Source/ddesktopwidget.cc > trunk/browser/Source/ddownloadwindow.cc > trunk/browser/Source/dhistory.cc > trunk/browser/Source/dmisc.cc > trunk/browser/Source/dooble.cc > trunk/browser/Source/dpagesourcewindow.cc > trunk/browser/Source/dsettings.cc > > Modified: trunk/browser/Source/dcookies.cc > =================================================================== > --- trunk/browser/Source/dcookies.cc 2011-07-07 19:24:44 UTC (rev 2467) > +++ trunk/browser/Source/dcookies.cc 2011-07-07 20:45:34 UTC (rev 2468) > @@ -85,8 +85,13 @@ > true).toBool() || > dooble::s_settings.value("settingsWindow/cookiesShouldBe", > 0).toInt() == 0) > - QFile::remove(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > +#ifdef Q_WS_WIN > + QFile::remove(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > + QFile::remove(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > else if(dooble::s_settings.value("settingsWindow/cookiesShouldBe", > 0).toInt() == 2) > deleteExpiredCookies(); > @@ -199,9 +204,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > @@ -256,9 +265,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > @@ -299,9 +312,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > @@ -331,10 +348,15 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > + > if(db.open()) > { > QSqlQuery query(db); > @@ -368,9 +390,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > @@ -419,9 +445,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > @@ -521,9 +551,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > @@ -582,9 +616,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "cookies"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "cookies.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "cookies.db"); > + ".dooble" + QDir::separator() + "cookies.db"); > +#endif > > if(db.open()) > { > > Modified: trunk/browser/Source/ddesktopwidget.cc > =================================================================== > --- trunk/browser/Source/ddesktopwidget.cc 2011-07-07 19:24:44 UTC > (rev 2467) > +++ trunk/browser/Source/ddesktopwidget.cc 2011-07-07 20:45:34 UTC > (rev 2468) > @@ -313,7 +313,11 @@ > > if(path.isEmpty() || !QFile::exists(path) || > !QFileInfo(path).isReadable()) > - path = QDir::homePath(); > +#ifdef Q_WS_WIN > + path = QDir::currentPath(); > +#else > + path = QDir::homePath(); > +#endif > } > > qobject_cast<dfilemanager *> (fileManagerWindow->widget())->load > > Modified: trunk/browser/Source/ddownloadwindow.cc > =================================================================== > --- trunk/browser/Source/ddownloadwindow.cc 2011-07-07 19:24:44 UTC > (rev 2467) > +++ trunk/browser/Source/ddownloadwindow.cc 2011-07-07 20:45:34 UTC > (rev 2468) > @@ -85,8 +85,13 @@ > > if(!dooble::s_settings.value("settingsWindow/rememberDownloads", > true).toBool()) > - QFile::remove(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "downloads.db"); > +#ifdef Q_WS_WIN > + QFile::remove(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "downloads.db"); > +#else > + QFile::remove(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + "downloads.db"); > +#endif > } > > void ddownloadwindow::populate(void) > @@ -100,9 +105,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "downloads"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "downloads.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "downloads.db"); > + ".dooble" + QDir::separator() + "downloads.db"); > +#endif > > if(db.open()) > { > @@ -321,9 +330,13 @@ > item->deleteLater(); > } > } > - > +#ifdef Q_WS_WIN > + QFile::remove(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "downloads.db"); > +#else > QFile::remove(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "downloads.db"); > + ".dooble" + QDir::separator() + "downloads.db"); > +#endif > } > > void ddownloadwindow::slotEnterUrl(void) > @@ -382,9 +395,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "downloads"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "downloads.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "downloads.db"); > + ".dooble" + QDir::separator() + "downloads.db"); > +#endif > > if(db.open()) > { > @@ -415,10 +432,13 @@ > > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "downloads"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "downloads.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "downloads.db"); > - > + ".dooble" + QDir::separator() + "downloads.db"); > +#endif > if(db.open()) > { > bool shouldEncode = dmisc::canEncode(); > > Modified: trunk/browser/Source/dhistory.cc > =================================================================== > --- trunk/browser/Source/dhistory.cc 2011-07-07 19:24:44 UTC (rev 2467) > +++ trunk/browser/Source/dhistory.cc 2011-07-07 20:45:34 UTC (rev 2468) > @@ -234,8 +234,13 @@ > > if(!dooble::s_settings.value("settingsWindow/rememberHistory", > true).toBool()) > - QFile::remove(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > +#ifdef Q_WS_WIN > + QFile::remove(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > + QFile::remove(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#endif > else > purge(); > } > @@ -281,9 +286,13 @@ > { > QSqlDatabase db = QSqlDatabase::addDatabase > ("QSQLITE", "history_window_purge_all"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > + ".dooble" + QDir::separator() + "history.db"); > +#endif > > if(db.open()) > { > @@ -369,9 +378,13 @@ > return; > > purge(); > - > +#ifdef Q_WS_WIN > + QFileInfo fileInfo(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > QFileInfo fileInfo(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > + ".dooble" + QDir::separator() + "history.db"); > +#endif > static QDateTime lastModificationTime(fileInfo.lastModified()); > > if(fileInfo.exists()) > @@ -399,10 +412,13 @@ > { > QSqlDatabase db = QSqlDatabase::addDatabase > ("QSQLITE", "history_window_delete"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > - > + ".dooble" + QDir::separator() + "history.db"); > +#endif > if(db.open()) > { > int removedRows = 0; > @@ -588,9 +604,13 @@ > { > QSqlDatabase db = QSqlDatabase::addDatabase > ("QSQLITE", "history_window_delete_all"); > - > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > + ".dooble" + QDir::separator() + "history.db"); > +#endif > > if(db.open()) > { > @@ -638,8 +658,13 @@ > QModelIndexList list(ui.history->selectionModel()->selectedRows()); > > { > - QFileInfo fileInfo(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > +#ifdef Q_WS_WIN > + QFileInfo fileInfo(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > + QFileInfo fileInfo(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#endif > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", > "history_window"); > > db.setDatabaseName(fileInfo.filePath()); > > Modified: trunk/browser/Source/dmisc.cc > =================================================================== > --- trunk/browser/Source/dmisc.cc 2011-07-07 19:24:44 UTC (rev 2467) > +++ trunk/browser/Source/dmisc.cc 2011-07-07 20:45:34 UTC (rev 2468) > @@ -426,8 +426,13 @@ > QIcon icon; > > { > - QFileInfo fileInfo(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > +#ifdef Q_WS_WIN > + QFileInfo fileInfo(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + > "history.db"); > +#else > + QFileInfo fileInfo(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + > "history.db"); > +#endif > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", > "history_dmisc"); > > > Modified: trunk/browser/Source/dooble.cc > =================================================================== > --- trunk/browser/Source/dooble.cc 2011-07-07 19:24:44 UTC (rev 2467) > +++ trunk/browser/Source/dooble.cc 2011-07-07 20:45:34 UTC (rev 2468) > @@ -196,11 +196,12 @@ > myappTranslator.load("dooble_" + QLocale::system().name(), > "translations"); > qapp.installTranslator(&myappTranslator); > - > +#ifdef Q_WS_WIN > + QDir homeDir(QDir::current()); > +#else > QDir homeDir(QDir::home()); > - > +#endif > homeDir.mkdir(".dooble"); > - > /* > ** Disable Web page icons. > */ > @@ -216,7 +217,11 @@ > QCoreApplication::setOrganizationDomain("dooble.sf.net"); > QSettings::setPath(QSettings::IniFormat, > QSettings::UserScope, > - QDir::homePath() + QDir::separator() + ".dooble"); > + #ifdef Q_WS_WIN > + QDir::currentPath() + QDir::separator() + > ".dooble"); > + #else > + QDir::homePath() + QDir::separator() + ".dooble"); > + #endif > QSettings::setDefaultFormat(QSettings::IniFormat); > > /* > @@ -261,9 +266,15 @@ > << "downloads.db"; > > while(!containers.isEmpty()) > - QFile::remove(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + > - containers.takeFirst()); > +#ifdef Q_WS_WIN > + QFile::remove(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + > + containers.takeFirst()); > +#else > + QFile::remove(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + > + containers.takeFirst()); > +#endif > } > > QList<QString> list(settings.allKeys()); > @@ -2232,7 +2243,11 @@ > > if(path.isEmpty() || !QFile::exists(path) || > !QFileInfo(path).isReadable()) > - path = QDir::homePath(); > +#ifdef Q_WS_WIN > + path = QDir::currentPath(); > +#else > + path = QDir::homePath(); > +#endif > } > > QWidget *parent = qobject_cast<QWidget *> (sender()); > @@ -2664,9 +2679,15 @@ > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "history"); > > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > + ".dooble" + QDir::separator() + "history.db"); > +#endif > > + > if(db.open()) > { > QSqlQuery query(db); > @@ -2679,8 +2700,14 @@ > } > > QSqlDatabase::removeDatabase("history"); > +#ifdef Q_WS_WIN > + QFile::remove(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > QFile::remove(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > + ".dooble" + QDir::separator() + "history.db"); > +#endif > + > } > > void dooble::slotShowSettingsWindow(void) > @@ -2832,7 +2859,11 @@ > fileDialog.setWindowModality(Qt::WindowModal); > fileDialog.setWindowTitle(tr("Dooble Web Browser: Open Directory")); > fileDialog.setFileMode(QFileDialog::Directory); > +#ifdef Q_WS_WIN > + fileDialog.setDirectory(QDir::currentPath()); > +#else > fileDialog.setDirectory(QDir::homePath()); > +#endif > fileDialog.setLabelText(QFileDialog::Accept, tr("&Open")); > fileDialog.setAcceptMode(QFileDialog::AcceptOpen); > > @@ -2872,7 +2903,11 @@ > (QDesktopServices::DesktopLocation); > > if(path.isEmpty() || !QFile::exists(path)) > - path = QDir::homePath(); > +#ifdef Q_WS_WIN > + path = QDir::currentPath(); > +#else > + path = QDir::homePath(); > +#endif > } > > loadPage(QUrl::fromLocalFile(path)); > @@ -2902,8 +2937,13 @@ > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "history"); > > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > + ".dooble" + QDir::separator() + "history.db"); > +#endif > > if(db.open()) > { > @@ -3498,10 +3538,14 @@ > { > { > QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "history"); > +#ifdef Q_WS_WIN > + db.setDatabaseName(QDir::currentPath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#else > + db.setDatabaseName(QDir::homePath() + QDir::separator() + > + ".dooble" + QDir::separator() + "history.db"); > +#endif > > - db.setDatabaseName(QDir::homePath() + QDir::separator() + > - ".dooble" + QDir::separator() + "history.db"); > - > if(db.open()) > { > QSqlQuery query(db); > > Modified: trunk/browser/Source/dpagesourcewindow.cc > =================================================================== > --- trunk/browser/Source/dpagesourcewindow.cc 2011-07-07 19:24:44 UTC > (rev 2467) > +++ trunk/browser/Source/dpagesourcewindow.cc 2011-07-07 20:45:34 UTC > (rev 2468) > @@ -266,7 +266,11 @@ > > if(path.isEmpty() || !QFile::exists(path) || > !QFileInfo(path).isReadable()) > - path = QDir::homePath(); > +#ifdef Q_WS_WIN > + path = QDir::currentPath(); > +#else > + path = QDir::homePath(); > +#endif > } > > QFileDialog fileDialog(this); > > Modified: trunk/browser/Source/dsettings.cc > =================================================================== > --- trunk/browser/Source/dsettings.cc 2011-07-07 19:24:44 UTC (rev 2467) > +++ trunk/browser/Source/dsettings.cc 2011-07-07 20:45:34 UTC (rev 2468) > @@ -187,7 +187,11 @@ > > if(path.isEmpty() || !QFile::exists(path) || > !QFileInfo(path).isReadable()) > - path = QDir::homePath(); > +#ifdef Q_WS_WIN > + path = QDir::currentPath(); > +#else > + path = QDir::homePath(); > +#endif > > settings.setValue("settingsWindow/myRetrievedFiles", path); > dooble::s_settings["settingsWindow/myRetrievedFiles"] = path; > @@ -1406,11 +1410,18 @@ > else > { > settings.setValue("settingsWindow/themesPath", > - QDir::homePath()); > + #ifdef Q_WS_WIN > + QDir::currentPath()); > + #else > + QDir::homePath()); > + #endif > dooble::s_settings["settingsWindow/themesPath"] = > - QDir::homePath(); > + #ifdef Q_WS_WIN > + QDir::currentPath(); > + #else > + QDir::homePath(); > + #endif > } > - > bool itemInserted = false; > QSettings cfgSettings(list[0], > QSettings::IniFormat); > @@ -1460,7 +1471,11 @@ > fileDialog.setWindowTitle > (tr("Dooble Web Browser: My Retrieved Files Directory Selection")); > fileDialog.setFileMode(QFileDialog::Directory); > - fileDialog.setDirectory(QDir::homePath()); > +#ifdef Q_WS_WIN > + fileDialog.setDirectory(QDir::currentPath()); > +#else > + fileDialog.setDirectory(QDir::homePath()); > +#endif > fileDialog.setLabelText(QFileDialog::Accept, tr("&Open")); > fileDialog.setAcceptMode(QFileDialog::AcceptOpen); > > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > All of the data generated in your IT infrastructure is seriously valuable. > Why? It contains a definitive record of application performance, security > threats, fraudulent activity, and more. Splunk takes this data and makes > sense of it. IT sense. And common sense. > http://p.sf.net/sfu/splunk-d2d-c2 > _______________________________________________ > Dooble-Team mailing list > Doo...@li... > https://lists.sourceforge.net/lists/listinfo/dooble-team > |