~ubuntu-branches/ubuntu/utopic/psi/utopic

« back to all changes in this revision

Viewing changes to src/fileutil.cpp

Committer: Bazaar Package Importer
Author(s): Jan Niehusmann
Date: 2010-02-19 09:37:12 UTC
mfrom: (6.1.5 sid)
Revision ID: james.westby@ubuntu.com-20100219093712-e225xvm1wjcf1cgi

Tags: 0.14-2

* comment out only function which uses va_list to work around build
problems on armel
* Set Standards-Version to 3.8.4

files added:
l10n.pro

qcm/buildmodeapp.qcm

qcm/enchant.qcm

qcm/spell.qcm

src/ahcformdlg.ui

src/ahcommanddlg.ui

src/libpsi

src/libpsi/COPYING

src/libpsi/README

src/libpsi/dialogs

src/libpsi/dialogs/grepshortcutkeydialog.cpp

src/libpsi/dialogs/grepshortcutkeydialog.h

src/libpsi/dialogs/grepshortcutkeydialog.pri

src/libpsi/dialogs/grepshortcutkeydialog.ui

src/libpsi/tools

src/libpsi/tools/atomicxmlfile

src/libpsi/tools/atomicxmlfile/atomicxmlfile.cpp

src/libpsi/tools/atomicxmlfile/atomicxmlfile.h

src/libpsi/tools/atomicxmlfile/atomicxmlfile.pri

src/libpsi/tools/globalshortcut

src/libpsi/tools/globalshortcut/globalshortcut.pri

src/libpsi/tools/globalshortcut/globalshortcutmanager.cpp

src/libpsi/tools/globalshortcut/globalshortcutmanager.h

src/libpsi/tools/globalshortcut/globalshortcutmanager_mac.cpp

src/libpsi/tools/globalshortcut/globalshortcutmanager_win.cpp

src/libpsi/tools/globalshortcut/globalshortcutmanager_x11.cpp

src/libpsi/tools/globalshortcut/globalshortcuttrigger.h

src/libpsi/tools/growlnotifier

src/libpsi/tools/growlnotifier/ChangeLog

src/libpsi/tools/growlnotifier/growlnotifier.cpp

src/libpsi/tools/growlnotifier/growlnotifier.h

src/libpsi/tools/growlnotifier/growlnotifier.pri

src/libpsi/tools/growlnotifier/growltest.cpp

src/libpsi/tools/growlnotifier/growltest.pro

src/libpsi/tools/idle

src/libpsi/tools/idle/idle.cpp

src/libpsi/tools/idle/idle.h

src/libpsi/tools/idle/idle.pri

src/libpsi/tools/idle/idle_mac.cpp

src/libpsi/tools/idle/idle_win.cpp

src/libpsi/tools/idle/idle_x11.cpp

src/libpsi/tools/idle/win32

src/libpsi/tools/idle/win32/Makefile

src/libpsi/tools/idle/win32/idleui.cpp

src/libpsi/tools/idle/win32/idleui.def

src/libpsi/tools/idle/win32/idleui.h

src/libpsi/tools/mac_dock

src/libpsi/tools/mac_dock/docktest.cpp

src/libpsi/tools/mac_dock/docktest.pro

src/libpsi/tools/mac_dock/mac_dock.cpp

src/libpsi/tools/mac_dock/mac_dock.h

src/libpsi/tools/mac_dock/mac_dock.pri

src/libpsi/tools/simplecli

src/libpsi/tools/simplecli/simplecli.cpp

src/libpsi/tools/simplecli/simplecli.h

src/libpsi/tools/simplecli/simplecli.pri

src/libpsi/tools/spellchecker

src/libpsi/tools/spellchecker/aspellchecker.cpp

src/libpsi/tools/spellchecker/aspellchecker.h

src/libpsi/tools/spellchecker/enchantchecker.cpp

src/libpsi/tools/spellchecker/enchantchecker.h

src/libpsi/tools/spellchecker/macspellchecker.h

src/libpsi/tools/spellchecker/macspellchecker.mm

src/libpsi/tools/spellchecker/spellchecker.cpp

src/libpsi/tools/spellchecker/spellchecker.h

src/libpsi/tools/spellchecker/spellchecker.pri

src/libpsi/tools/spellchecker/spellhighlighter.cpp

src/libpsi/tools/spellchecker/spellhighlighter.h

src/libpsi/tools/systemwatch

src/libpsi/tools/systemwatch/systemwatch.cpp

src/libpsi/tools/systemwatch/systemwatch.h

src/libpsi/tools/systemwatch/systemwatch.pri

src/libpsi/tools/systemwatch/systemwatch_mac.cpp

src/libpsi/tools/systemwatch/systemwatch_mac.h

src/libpsi/tools/systemwatch/systemwatch_unix.cpp

src/libpsi/tools/systemwatch/systemwatch_unix.h

src/libpsi/tools/systemwatch/systemwatch_win.cpp

src/libpsi/tools/systemwatch/systemwatch_win.h

src/libpsi/tools/zip

src/libpsi/tools/zip/minizip

src/libpsi/tools/zip/minizip/ChangeLogUnzip

src/libpsi/tools/zip/minizip/Makefile

src/libpsi/tools/zip/minizip/miniunz.c

src/libpsi/tools/zip/minizip/minizip.c

src/libpsi/tools/zip/minizip/other

src/libpsi/tools/zip/minizip/other/zip.c

src/libpsi/tools/zip/minizip/other/zip.def

src/libpsi/tools/zip/minizip/other/zip.h

src/libpsi/tools/zip/minizip/readme.txt

src/libpsi/tools/zip/minizip/unzip.c

src/libpsi/tools/zip/minizip/unzip.def

src/libpsi/tools/zip/minizip/unzip.h

src/libpsi/tools/zip/minizip/win32

src/libpsi/tools/zip/minizip/win32/zconf.h

src/libpsi/tools/zip/minizip/win32/zlib.h

src/libpsi/tools/zip/minizip/zlibvc.def

src/libpsi/tools/zip/minizip/zlibvc.dsp

src/libpsi/tools/zip/minizip/zlibvc.dsw

src/libpsi/tools/zip/zip.cpp

src/libpsi/tools/zip/zip.h

src/libpsi/tools/zip/zip.pri

src/libpsi/widgets

src/libpsi/widgets/groupchatbrowsewindow.cpp

src/libpsi/widgets/groupchatbrowsewindow.h

src/libpsi/widgets/groupchatbrowsewindow.ui

src/mucreasonseditor.cpp

src/mucreasonseditor.h

src/mucreasonseditor.ui

src/psicli.h

src/tools/optionstree/optionstreereader.cpp

src/tools/optionstree/optionstreereader.h

src/tools/optionstree/optionstreewriter.cpp

src/tools/optionstree/optionstreewriter.h

src/vcardphotodlg.cpp

src/vcardphotodlg.h

src/widgets/actionlineedit.cpp

src/widgets/actionlineedit.h

files removed:
src/tools/atomicxmlfile

src/tools/atomicxmlfile/atomicxmlfile.cpp

src/tools/atomicxmlfile/atomicxmlfile.h

src/tools/atomicxmlfile/atomicxmlfile.pri

src/tools/contactlist

src/tools/contactlist/contactlist.cpp

src/tools/contactlist/contactlist.h

src/tools/contactlist/contactlist.pri

src/tools/contactlist/contactlist.pro

src/tools/contactlist/contactlistalphacomparator.cpp

src/tools/contactlist/contactlistalphacomparator.h

src/tools/contactlist/contactlistcontact.cpp

src/tools/contactlist/contactlistcontact.h

src/tools/contactlist/contactlistgroup.cpp

src/tools/contactlist/contactlistgroup.h

src/tools/contactlist/contactlistgroupitem.cpp

src/tools/contactlist/contactlistgroupitem.h

src/tools/contactlist/contactlistitem.cpp

src/tools/contactlist/contactlistitem.h

src/tools/contactlist/contactlistitemcomparator.h

src/tools/contactlist/contactlistmodel.cpp

src/tools/contactlist/contactlistmodel.h

src/tools/contactlist/contactlistrootitem.h

src/tools/contactlist/contactlistview.cpp

src/tools/contactlist/contactlistview.h

src/tools/contactlist/example

src/tools/contactlist/example/close.png

src/tools/contactlist/example/example.pro

src/tools/contactlist/example/icons

src/tools/contactlist/example/icons/away.png

src/tools/contactlist/example/icons/offline.png

src/tools/contactlist/example/icons/online.png

src/tools/contactlist/example/main.cpp

src/tools/contactlist/example/mycontact.h

src/tools/contactlist/example/mycontactlist.h

src/tools/contactlist/example/mygroup.h

src/tools/contactlist/example/pictures

src/tools/contactlist/example/pictures/anne.jpg

src/tools/contactlist/example/pictures/bill.jpg

src/tools/contactlist/example/pictures/brian.jpg

src/tools/contactlist/example/pictures/joanna.jpg

src/tools/contactlist/example/pictures/lawrence.jpg

src/tools/contactlist/example/pictures/mike.jpg

src/tools/contactlist/example/pictures/milton.jpg

src/tools/contactlist/example/pictures/peter.jpg

src/tools/contactlist/example/pictures/samir.jpg

src/tools/contactlist/example/pictures/unknown.png

src/tools/contactlist/example/resources.qrc

src/tools/contactlist/status.h

src/tools/globalshortcut

src/tools/globalshortcut/globalshortcut.pri

src/tools/globalshortcut/globalshortcutmanager.cpp

src/tools/globalshortcut/globalshortcutmanager.h

src/tools/globalshortcut/globalshortcutmanager_mac.cpp

src/tools/globalshortcut/globalshortcutmanager_win.cpp

src/tools/globalshortcut/globalshortcutmanager_x11.cpp

src/tools/globalshortcut/globalshortcuttrigger.h

src/tools/grepshortcutkeydlg

src/tools/grepshortcutkeydlg/grepshortcutkeydlg.cpp

src/tools/grepshortcutkeydlg/grepshortcutkeydlg.h

src/tools/grepshortcutkeydlg/grepshortcutkeydlg.pri

src/tools/grepshortcutkeydlg/grepshortcutkeydlg.ui

src/tools/growlnotifier

src/tools/growlnotifier/ChangeLog

src/tools/growlnotifier/growlnotifier.cpp

src/tools/growlnotifier/growlnotifier.h

src/tools/growlnotifier/growlnotifier.pri

src/tools/growlnotifier/growltest.cpp

src/tools/growlnotifier/growltest.pro

src/tools/idle

src/tools/idle/idle.cpp

src/tools/idle/idle.h

src/tools/idle/idle.pri

src/tools/idle/idle_mac.cpp

src/tools/idle/idle_win.cpp

src/tools/idle/idle_x11.cpp

src/tools/idle/win32

src/tools/idle/win32/Makefile

src/tools/idle/win32/idleui.cpp

src/tools/idle/win32/idleui.def

src/tools/idle/win32/idleui.h

src/tools/mac_dock

src/tools/mac_dock/docktest.cpp

src/tools/mac_dock/docktest.pro

src/tools/mac_dock/mac_dock.cpp

src/tools/mac_dock/mac_dock.h

src/tools/mac_dock/mac_dock.pri

src/tools/spellchecker

src/tools/spellchecker/aspellchecker.cpp

src/tools/spellchecker/aspellchecker.h

src/tools/spellchecker/macspellchecker.h

src/tools/spellchecker/macspellchecker.mm

src/tools/spellchecker/spellchecker.cpp

src/tools/spellchecker/spellchecker.h

src/tools/spellchecker/spellchecker.pri

src/tools/spellchecker/spellhighlighter.cpp

src/tools/spellchecker/spellhighlighter.h

src/tools/svgstreamviewer

src/tools/svgstreamviewer/main.cpp

src/tools/svgstreamviewer/mainwindow.cpp

src/tools/svgstreamviewer/mainwindow.h

src/tools/svgstreamviewer/svgstreamrenderer.cpp

src/tools/svgstreamviewer/svgstreamrenderer.h

src/tools/svgstreamviewer/svgstreamviewer.pro

src/tools/svgstreamviewer/svgstreamwidget.cpp

src/tools/svgstreamviewer/svgstreamwidget.h

src/tools/systemwatch

src/tools/systemwatch/systemwatch.cpp

src/tools/systemwatch/systemwatch.h

src/tools/systemwatch/systemwatch.pri

src/tools/systemwatch/systemwatch_mac.cpp

src/tools/systemwatch/systemwatch_mac.h

src/tools/systemwatch/systemwatch_unix.cpp

src/tools/systemwatch/systemwatch_unix.h

src/tools/systemwatch/systemwatch_win.cpp

src/tools/systemwatch/systemwatch_win.h

src/tools/trayicon

src/tools/trayicon/trayicon.cpp

src/tools/trayicon/trayicon.h

src/tools/trayicon/trayicon.pri

src/tools/trayicon/trayicon_mac.cpp

src/tools/trayicon/trayicon_win.cpp

src/tools/trayicon/trayicon_x11.cpp

src/tools/zip

src/tools/zip/minizip

src/tools/zip/minizip/ChangeLogUnzip

src/tools/zip/minizip/Makefile

src/tools/zip/minizip/miniunz.c

src/tools/zip/minizip/minizip.c

src/tools/zip/minizip/other

src/tools/zip/minizip/other/zip.c

src/tools/zip/minizip/other/zip.def

src/tools/zip/minizip/other/zip.h

src/tools/zip/minizip/readme.txt

src/tools/zip/minizip/unzip.c

src/tools/zip/minizip/unzip.def

src/tools/zip/minizip/unzip.h

src/tools/zip/minizip/win32

src/tools/zip/minizip/win32/zconf.h

src/tools/zip/minizip/win32/zlib.h

src/tools/zip/minizip/zlibvc.def

src/tools/zip/minizip/zlibvc.dsp

src/tools/zip/minizip/zlibvc.dsw

src/tools/zip/zip.cpp

src/tools/zip/zip.h

src/tools/zip/zip.pri

files modified:
.gitmodules

INSTALL

README

conf_windows.pri

configure

debian/changelog

debian/control

debian/rules

doc/build-unix.txt

doc/build-win.txt

iconsets/system/default/icondef.xml

iris/src/irisnet/noncore/stunbinding.cpp

iris/src/jdns/jdns_p.h

iris/src/jdns/jdns_sys.c

iris/src/xmpp/xmpp-im/client.cpp

iris/src/xmpp/xmpp-im/types.cpp

iris/src/xmpp/xmpp-im/xmpp_client.h

iris/src/xmpp/xmpp-im/xmpp_message.h

iris/src/xmpp/xmpp-im/xmpp_task.cpp

iris/src/xmpp/xmpp-im/xmpp_tasks.cpp

mac/Info.plist

mac/Makefile

options/default.xml

psi.desktop

psi.qc

qa/oldtest/unittest.pri

qcm/aspell.qcm

qcm/conf.qcm

qcm/growl.qcm

qcm/openssl.qcm

qcm/qca.qcm

qcm/xss.qcm

qcm/zlib.qcm

src/Certificates/CertificateErrorDialog.cpp

src/Certificates/CertificateErrorDialog.h

src/Certificates/CertificateHelpers.cpp

src/CocoaUtilities/CocoaInitializer.mm

src/aboutdlg.cpp

src/accountadddlg.cpp

src/accountmanage.ui

src/accountmanagedlg.cpp

src/accountmanagedlg.h

src/accountmodify.ui

src/accountmodifydlg.cpp

src/accountregdlg.cpp

src/accountremove.ui

src/accountscombobox.cpp

src/actionlist.cpp

src/activeprofiles.cpp

src/activeprofiles.h

src/activeprofiles_dbus.cpp

src/activeprofiles_stub.cpp

src/activeprofiles_win.cpp

src/adduserdlg.cpp

src/ahcformdlg.cpp

src/ahcformdlg.h

src/ahcommanddlg.cpp

src/ahcommanddlg.h

src/applicationinfo.cpp

src/avatars.cpp

src/avcall/avcall.cpp

src/avcall/calldlg.cpp

src/avcall/jinglertp.cpp

src/bookmarkmanagedlg.cpp

src/changepw.ui

src/changepwdlg.cpp

src/changepwdlg.h

src/chatdlg.cpp

src/common.cpp

src/common.h

src/conf_iris.pri

src/dbus.cpp

src/disco.ui

src/discodlg.cpp

src/eventdb.cpp

src/eventdb.h

src/eventdlg.cpp

src/eventdlg.h

src/filetransdlg.cpp

src/fileutil.cpp

src/gcuserview.cpp

src/gcuserview.h

src/groupchatdlg.cpp

src/groupchatdlg.h

src/historydlg.cpp

src/info.ui

src/infodlg.cpp

src/infodlg.h

src/jidutil.cpp

src/lastactivitytask.cpp

src/lastactivitytask.h

src/main.cpp

src/main.h

src/mainwin.cpp

src/mainwin.h

src/mainwin_p.cpp

src/mainwin_p.h

src/mcmdsimplesite.cpp

src/minicmd.h

src/msgmle.cpp

src/mucjoin.ui

src/mucjoindlg.cpp

src/options/opt_advanced.cpp

src/options/opt_appearance.cpp

src/options/opt_appearance.ui

src/options/opt_application.cpp

src/options/opt_application.h

src/options/opt_application.ui

src/options/opt_chat.cpp

src/options/opt_chat.ui

src/options/opt_events.cpp

src/options/opt_groupchat.cpp

src/options/opt_iconset.cpp

src/options/opt_plugins.cpp

src/options/opt_shortcuts.cpp

src/options/opt_shortcuts.h

src/options/opt_sound.cpp

src/options/opt_status.cpp

src/options/opt_toolbars.cpp

src/options/opt_tree.cpp

src/options/optionsdlg.cpp

src/options/optionsdlg.h

src/options/optionstab.cpp

src/options/optionstab.h

src/options/ui_isdetails.ui

src/options/ui_options.ui

src/pgpkey.ui

src/pgpkeydlg.cpp

src/pgpkeydlg.h

src/pgputil.cpp

src/pluginhost.cpp

src/pluginmanager.cpp

src/plugins/generic/chess/chess-standalone.pro

src/plugins/generic/chess/chessplugin.pro

src/plugins/generic/chess/gameboard.cpp

src/plugins/generic/chess/gameboard.h

src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.pro

src/privacy/privacy.ui

src/privacy/privacydlg.cpp

src/privacy/privacyruledlg.cpp

src/profiledlg.cpp

src/profiledlg.h

src/profilemanage.ui

src/profilenew.ui

src/proxy.cpp

src/proxy.h

src/proxy.ui

src/psi_profiles.cpp

src/psiaccount.cpp

src/psiaccount.h

src/psiactionlist.cpp

src/psiapplication.cpp

src/psichatdlg.cpp

src/psicon.cpp

src/psicon.h

src/psicontactlist.cpp

src/psicontactlist.h

src/psievent.cpp

src/psiiconset.cpp

src/psiiconset.h

src/psioptions.cpp

src/psioptionseditor.cpp

src/psipopup.cpp

src/psitoolbar.cpp

src/psitrayicon.cpp

src/psitrayicon.h

src/rc.cpp

src/registrationdlg.cpp

src/rtparse.cpp

src/searchdlg.cpp

src/serverlistquerier.cpp

src/shortcutmanager.cpp

src/showtextdlg.cpp

src/src.pri

src/src.pro

src/statuscombobox.cpp

src/statusdlg.cpp

src/systeminfo.cpp

src/tabcompletion.cpp

src/tabs/tabdlg.cpp

src/tabs/tabdlg.h

src/tasklist.h

src/textutil.cpp

src/tools/advwidget/advwidget.cpp

src/tools/crash/crash_sigsegv.cpp

src/tools/iconset/anim.cpp

src/tools/iconset/anim.h

src/tools/iconset/iconset.cpp

src/tools/iconset/iconset.h

src/tools/iconset/unittest/testiconset.cpp

src/tools/iconset/unittest/testiconset.pro

src/tools/optionstree/optionstree.cpp

src/tools/optionstree/optionstree.h

src/tools/optionstree/optionstree.pri

src/tools/optionstree/unittest/OptionsTreeMainTest.cpp

src/tools/optionstree/varianttree.h

src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp

src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp

src/translationmanager.cpp

src/unittest/half_of_psi.pri

src/unittest/unittest.pro

src/userlist.cpp

src/userlist.h

src/varlist.cpp

src/vcardfactory.cpp

src/voicecalldlg.cpp

src/whiteboarding/wbdlg.cpp

src/widgets/fancylabel.cpp

src/widgets/fancypopup.cpp

src/widgets/fancypopuplist.h

src/widgets/iconaction.cpp

src/widgets/iconselect.cpp

src/widgets/iconselect.h

src/widgets/iconwidget.cpp

src/widgets/psirichtext.cpp

src/widgets/psirichtext.h

src/widgets/psitabwidget.cpp

src/widgets/psitextview.cpp

src/widgets/psitextview.h

src/widgets/unittest/iconaction/testiconaction.cpp

src/widgets/urlobject.cpp

src/widgets/widgets.pri

src/widgets/widgets.pro

src/xdata_widget.cpp

src/xmlconsole.cpp

src/xmlconsole.h

third-party/qca/qca-ossl.pri

win32/Makefile

Show diffs side-by-side

added added

removed removed

src/fileutil.cpp

{

while (1) {

if (lastUsedOpenPath().isEmpty()) {

setLastUsedOpenPath(QDir::homeDirPath());

setLastUsedOpenPath(QDir::homePath());

}

QString fileName = QFileDialog::getOpenFileName(parent, caption, lastUsedOpenPath(), filter, selectedFilter);

if (!fileName.isEmpty()) {

continue;

}

setLastUsedOpenPath(fi.dirPath());

setLastUsedOpenPath(fi.path());

return fileName;

}

break;

setLastUsedSavePath(lastUsedOpenPath());

}

else {

setLastUsedSavePath(QDir::homeDirPath());

setLastUsedSavePath(QDir::homePath());

}

QString fileName = QFileDialog::getSaveFileName(parent, caption, dir, filter, selectedFilter);

if (!fileName.isEmpty()) {

QFileInfo fi(fileName);

if (QDir(fi.dirPath()).exists()) {

setLastUsedSavePath(fi.dirPath());

if (QDir(fi.path()).exists()) {

setLastUsedSavePath(fi.path());

return fileName;

100

}

101

}

Older »