Sigh, recovert the two patches to DOS line endings.

The files they are patching have DOS line endings, so... Brown paper bag to me.
This commit is contained in:
Raphael Kubo da Costa 2012-05-20 02:07:30 +00:00
parent 8eece0c818
commit c7bd24eb19
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=296992
2 changed files with 39 additions and 39 deletions

View file

@ -1,15 +1,15 @@
--- src/cmds/cmds.cpp~ 2012-05-19 22:44:14.000000000 -0300
+++ src/cmds/cmds.cpp 2012-05-19 22:44:25.000000000 -0300
@@ -89,9 +89,9 @@
QPalette newPalette = QPalette();
- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
setPalette(newPalette);
--- src/cmds/cmds.cpp~ 2012-05-19 22:44:14.000000000 -0300
+++ src/cmds/cmds.cpp 2012-05-19 22:44:25.000000000 -0300
@@ -89,9 +89,9 @@
QPalette newPalette = QPalette();
- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
setPalette(newPalette);

View file

@ -1,24 +1,24 @@
--- src/fgui/cadform.cpp~ 2012-05-19 22:45:11.000000000 -0300
+++ src/fgui/cadform.cpp 2012-05-19 22:46:08.000000000 -0300
@@ -475,9 +475,9 @@
QPalette newPalette = palette();
- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
@@ -800,7 +800,7 @@
w->GLThisArea->cscalari=hcmd->cscalari;
w->GLThisArea->View=View;
- w->setWindowTitle(QString::QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
+ w->setWindowTitle(QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
w->show();
QWidgetList windoL=ws->windowList(QWorkspace::CreationOrder);
if ( windoL.count()==1){
--- src/fgui/cadform.cpp~ 2012-05-19 22:45:11.000000000 -0300
+++ src/fgui/cadform.cpp 2012-05-19 22:46:08.000000000 -0300
@@ -475,9 +475,9 @@
QPalette newPalette = palette();
- newPalette.setColor(QPalette::Background, QColor::QColor(170,170,255));
- newPalette.setColor(QPalette::Foreground, QColor::QColor(0,0,0));
- newPalette.setColor(QPalette::Base, QColor::QColor(170,170,255));
+ newPalette.setColor(QPalette::Background, QColor(170,170,255));
+ newPalette.setColor(QPalette::Foreground, QColor(0,0,0));
+ newPalette.setColor(QPalette::Base, QColor(170,170,255));
@@ -800,7 +800,7 @@
w->GLThisArea->cscalari=hcmd->cscalari;
w->GLThisArea->View=View;
- w->setWindowTitle(QString::QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
+ w->setWindowTitle(QString(tr("ViewPort-%1")).arg(numDoc++));w->setWindowIcon( QPixmap(ProgramPath+"images/document.png") );
w->show();
QWidgetList windoL=ws->windowList(QWorkspace::CreationOrder);
if ( windoL.count()==1){