From 569285794b9112f0134ddad4bb886308ea4a7be6 Mon Sep 17 00:00:00 2001 From: Torne Wuff Date: Sun, 6 Nov 2011 22:44:25 +0000 Subject: Bulk convert all DOS line endings to UNIX. For the git migration we want a nice clean repository with UNIX line endings. git does not use svn:eol-style, we just need the file contents to be sane. Sorry everybody. I know this messes up blame. Scumbag *NIX developer says migrating to git will make line ending issues go away; commits giant change to svn which changes line endings anyway. :) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30924 a1c6a512-1295-4272-9138-f99709370657 --- utils/MTP/sendfirm.manifest | 16 +- utils/tcctool/tcctool-windows.txt | 62 ++-- .../qtfindreplacedialog/findreplace_global.h | 42 +-- .../qtfindreplacedialog/findreplacedialog.ui | 64 ++-- .../qtfindreplacedialog/findreplaceform.ui | 408 ++++++++++----------- utils/themeeditor/themeeditor.rc | 2 +- 6 files changed, 297 insertions(+), 297 deletions(-) (limited to 'utils') diff --git a/utils/MTP/sendfirm.manifest b/utils/MTP/sendfirm.manifest index 324c707e1c..307b6c2a01 100644 --- a/utils/MTP/sendfirm.manifest +++ b/utils/MTP/sendfirm.manifest @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/utils/tcctool/tcctool-windows.txt b/utils/tcctool/tcctool-windows.txt index d116bfeefe..f19e2b0e58 100644 --- a/utils/tcctool/tcctool-windows.txt +++ b/utils/tcctool/tcctool-windows.txt @@ -1,31 +1,31 @@ -tcctool for Windows -------------------- - -Installation ------------- - -When you first attach your device in USB boot mode to your computer, -Windows should display the Found New Hardware Wizard. - -If this doesn't appear, and if you have previously used a firmware -recovery tool with your device, you will need to uninstall the USB -driver used by that application. - -Go into Control Panel -> System -> Hardware -> Device Manager, then -click on Universal Serial Bus Controllers, look for something like -"Telechips TCC77x VTC USB Driver", right-click on it and select -Uninstall. - -After doing this, disconnect and reconnect your device and the Found -New Hardware Wizard should appear. - -Select "No, not this time" to the question about connecting to Windows -Update, and select "Install from a list or specific location -(Advanced)" on the next screen. - -On the next screen, select "Search for the best driver in these -locations", unselect "Search removable media", select "Include this -location in the search:" and browse to the tcctool-driver-win32 -folder. - -You should now be able to run tcctool.exe +tcctool for Windows +------------------- + +Installation +------------ + +When you first attach your device in USB boot mode to your computer, +Windows should display the Found New Hardware Wizard. + +If this doesn't appear, and if you have previously used a firmware +recovery tool with your device, you will need to uninstall the USB +driver used by that application. + +Go into Control Panel -> System -> Hardware -> Device Manager, then +click on Universal Serial Bus Controllers, look for something like +"Telechips TCC77x VTC USB Driver", right-click on it and select +Uninstall. + +After doing this, disconnect and reconnect your device and the Found +New Hardware Wizard should appear. + +Select "No, not this time" to the question about connecting to Windows +Update, and select "Install from a list or specific location +(Advanced)" on the next screen. + +On the next screen, select "Search for the best driver in these +locations", unselect "Search removable media", select "Include this +location in the search:" and browse to the tcctool-driver-win32 +folder. + +You should now be able to run tcctool.exe diff --git a/utils/themeeditor/qtfindreplacedialog/findreplace_global.h b/utils/themeeditor/qtfindreplacedialog/findreplace_global.h index be71bff752..8b4b2a8e0a 100644 --- a/utils/themeeditor/qtfindreplacedialog/findreplace_global.h +++ b/utils/themeeditor/qtfindreplacedialog/findreplace_global.h @@ -1,21 +1,21 @@ -/* - * Copyright (C) 2009 Lorenzo Bettini - * See COPYING file that comes with this distribution - */ - -#ifndef FINDREPLACE_GLOBAL_H -#define FINDREPLACE_GLOBAL_H - -#include - -#ifndef FINDREPLACE_NOLIB -#if defined(FINDREPLACE_LIBRARY) -# define FINDREPLACESHARED_EXPORT Q_DECL_EXPORT -#else -# define FINDREPLACESHARED_EXPORT Q_DECL_IMPORT -#endif -#else -#define FINDREPLACESHARED_EXPORT -#endif - -#endif // FINDREPLACE_GLOBAL_H +/* + * Copyright (C) 2009 Lorenzo Bettini + * See COPYING file that comes with this distribution + */ + +#ifndef FINDREPLACE_GLOBAL_H +#define FINDREPLACE_GLOBAL_H + +#include + +#ifndef FINDREPLACE_NOLIB +#if defined(FINDREPLACE_LIBRARY) +# define FINDREPLACESHARED_EXPORT Q_DECL_EXPORT +#else +# define FINDREPLACESHARED_EXPORT Q_DECL_IMPORT +#endif +#else +#define FINDREPLACESHARED_EXPORT +#endif + +#endif // FINDREPLACE_GLOBAL_H diff --git a/utils/themeeditor/qtfindreplacedialog/findreplacedialog.ui b/utils/themeeditor/qtfindreplacedialog/findreplacedialog.ui index 74984b3070..3bc837e099 100644 --- a/utils/themeeditor/qtfindreplacedialog/findreplacedialog.ui +++ b/utils/themeeditor/qtfindreplacedialog/findreplacedialog.ui @@ -1,32 +1,32 @@ - - - FindReplaceDialog - - - - 0 - 0 - 342 - 140 - - - - Find/Replace - - - - - - - - - - FindReplaceForm - QWidget -
findreplaceform.h
- 1 - - - - - + + + FindReplaceDialog + + + + 0 + 0 + 342 + 140 + + + + Find/Replace + + + + + + + + + + FindReplaceForm + QWidget +
findreplaceform.h
+ 1 + + + + + diff --git a/utils/themeeditor/qtfindreplacedialog/findreplaceform.ui b/utils/themeeditor/qtfindreplacedialog/findreplaceform.ui index acc055ca88..a68e120772 100644 --- a/utils/themeeditor/qtfindreplacedialog/findreplaceform.ui +++ b/utils/themeeditor/qtfindreplacedialog/findreplaceform.ui @@ -1,204 +1,204 @@ - - - FindReplaceForm - - - - 0 - 0 - 483 - 288 - - - - Form - - - - - - - - - - - - &Find: - - - textToFind - - - - - - - - - - R&eplace with: - - - textToReplace - - - - - - - - - - - - - - errorLabel - - - - - - - - - D&irection - - - - - - &Down - - - true - - - - - - - &Up - - - - - - - - - - &Options - - - - - - &Case sensitive - - - - - - - &Whole words only - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">whether the text to search should be interpreted as a regular expression.</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You may want to take a look at the syntax of regular expressions:</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://doc.trolltech.com/qregexp.html"><span style=" text-decoration: underline; color:#0000ff;">http://doc.trolltech.com/qregexp.html</span></a></p></body></html> - - - R&egular Expression - - - - - - - - - - - - - - 10 - - - - - false - - - &Find - - - - - - - &Close - - - - - - - false - - - &Replace - - - - - - - false - - - Replace &All - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - textToFind - textToReplace - downRadioButton - upRadioButton - caseCheckBox - wholeCheckBox - regexCheckBox - findButton - closeButton - - - - + + + FindReplaceForm + + + + 0 + 0 + 483 + 288 + + + + Form + + + + + + + + + + + + &Find: + + + textToFind + + + + + + + + + + R&eplace with: + + + textToReplace + + + + + + + + + + + + + + errorLabel + + + + + + + + + D&irection + + + + + + &Down + + + true + + + + + + + &Up + + + + + + + + + + &Options + + + + + + &Case sensitive + + + + + + + &Whole words only + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">whether the text to search should be interpreted as a regular expression.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You may want to take a look at the syntax of regular expressions:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://doc.trolltech.com/qregexp.html"><span style=" text-decoration: underline; color:#0000ff;">http://doc.trolltech.com/qregexp.html</span></a></p></body></html> + + + R&egular Expression + + + + + + + + + + + + + + 10 + + + + + false + + + &Find + + + + + + + &Close + + + + + + + false + + + &Replace + + + + + + + false + + + Replace &All + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + textToFind + textToReplace + downRadioButton + upRadioButton + caseCheckBox + wholeCheckBox + regexCheckBox + findButton + closeButton + + + + diff --git a/utils/themeeditor/themeeditor.rc b/utils/themeeditor/themeeditor.rc index 7d588cbcf2..6272b356ef 100644 --- a/utils/themeeditor/themeeditor.rc +++ b/utils/themeeditor/themeeditor.rc @@ -1 +1 @@ -EDITOR_ICON ICON DISCARDABLE "resources/windowicon.ico" +EDITOR_ICON ICON DISCARDABLE "resources/windowicon.ico" -- cgit v1.2.3