[Kde-cygwin-cvs] CVS: qt-3/tools/linguist/linguist finddialog.cpp,1.1.1.4,1.2 finddialog.h,1.1.1.4,1
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
[Kde-cygwin-cvs] CVS: qt-3/tools/linguist/linguist finddialog.cpp,1.1.1.4,1.2 finddialog.h,1.1.1.4,1.2 listviews.cpp,1.1.1.4,1.2 listviews.h,1.1.1.4,1.2 main.cpp,1.1.1.9,1.2 msgedit.cpp,1.1.1.9,1.2 msgedit.h,1.1.1.4,1.2 phrase.cpp,1.1.1.5,1.2 phrase.h,1.1.1.4,1.2 phrasebookbox.cpp,1.1.1.4,1.2 phrasebookbox.h,1.1.1.4,1.2 phraselv.cpp,1.1.1.4,1.2 phraselv.h,1.1.1.4,1.2 printout.cpp,1.1.1.4,1.2 printout.h,1.1.1.5,1.2 simtexth.cpp,1.1.1.5,1.2 simtexth.h,1.1.1.4,1.2 statistics.ui.h,1.1.1.2,1.2 trwindow.cpp,1.1.1.6,1.2 trwindow.h,1.1.1.4,1.2
Update of /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/tools/linguist/linguist Modified Files: finddialog.cpp finddialog.h listviews.cpp listviews.h main.cpp msgedit.cpp msgedit.h phrase.cpp phrase.h phrasebookbox.cpp phrasebookbox.h phraselv.cpp phraselv.h printout.cpp printout.h simtexth.cpp simtexth.h statistics.ui.h trwindow.cpp trwindow.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: finddialog.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/finddialog.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- finddialog.cpp 22 Sep 2005 12:58:52 -0000 1.1.1.4 +++ finddialog.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: finddialog.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/finddialog.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- finddialog.h 22 Sep 2005 12:58:51 -0000 1.1.1.4 +++ finddialog.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2001 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: listviews.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/listviews.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- listviews.cpp 22 Sep 2005 12:58:53 -0000 1.1.1.4 +++ listviews.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: listviews.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/listviews.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- listviews.h 22 Sep 2005 12:58:51 -0000 1.1.1.4 +++ listviews.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: main.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/main.cpp,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- main.cpp 22 Sep 2005 12:58:52 -0000 1.1.1.9 +++ main.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** @@ -47,6 +47,7 @@ bool showSplash = TRUE; +/* obsolate code QString keybase("/Qt Linguist/3.1/"); QSettings config; config.insertSearchPath( QSettings::Windows, "/Trolltech" ); @@ -56,7 +57,7 @@ r.setY( config.readNumEntry( keybase + "Geometry/MainwindowY", r.y() ) ); r.setWidth( config.readNumEntry( keybase + "Geometry/MainwindowWidth", r.width() ) ); r.setHeight( config.readNumEntry( keybase + "Geometry/MainwindowHeight", r.height() ) ); - +*/ QSplashScreen *splash = 0; if ( showSplash ) { splash = new QSplashScreen( QPixmap::fromMimeSource("splash.png"), @@ -70,6 +71,14 @@ if ( app.argc() > 1 ) tw->openFile( QString(app.argv()[app.argc() - 1]) ); + //<-- this is duplicated from trwindow.cpp and should be moved to there + QString keybase( "/Qt Linguist/" + + QString::number( (QT_VERSION >> 16) & 0xff ) + + "." + QString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + QSettings config; + + config.insertSearchPath( QSettings::Windows, "/Trolltech" ); + //--> if ( config.readBoolEntry( keybase + "Geometry/MainwindowMaximized", FALSE ) ) tw->showMaximized(); else Index: msgedit.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/msgedit.cpp,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- msgedit.cpp 22 Sep 2005 12:58:53 -0000 1.1.1.9 +++ msgedit.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: msgedit.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/msgedit.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- msgedit.h 22 Sep 2005 12:58:52 -0000 1.1.1.4 +++ msgedit.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: phrase.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/phrase.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- phrase.cpp 22 Sep 2005 12:58:53 -0000 1.1.1.5 +++ phrase.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2001 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** @@ -37,8 +37,8 @@ static QString protect( const QString& str ) { QString p = str; - p.replace( "&", "&" ); p.replace( "\"", """ ); + p.replace( "&", "&" ); p.replace( ">", ">" ); p.replace( "<", "<" ); p.replace( "'", "'" ); Index: phrase.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/phrase.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- phrase.h 22 Sep 2005 12:58:52 -0000 1.1.1.4 +++ phrase.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2001 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: phrasebookbox.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/phrasebookbox.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- phrasebookbox.cpp 22 Sep 2005 12:58:53 -0000 1.1.1.4 +++ phrasebookbox.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: phrasebookbox.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/phrasebookbox.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- phrasebookbox.h 22 Sep 2005 12:58:53 -0000 1.1.1.4 +++ phrasebookbox.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: phraselv.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/phraselv.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- phraselv.cpp 22 Sep 2005 12:58:53 -0000 1.1.1.4 +++ phraselv.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: phraselv.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/phraselv.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- phraselv.h 22 Sep 2005 12:58:53 -0000 1.1.1.4 +++ phraselv.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: printout.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/printout.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- printout.cpp 22 Sep 2005 12:58:52 -0000 1.1.1.4 +++ printout.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2001 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: printout.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/printout.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- printout.h 22 Sep 2005 12:58:53 -0000 1.1.1.5 +++ printout.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2001 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: simtexth.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/simtexth.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- simtexth.cpp 22 Sep 2005 12:58:50 -0000 1.1.1.5 +++ simtexth.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: simtexth.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/simtexth.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- simtexth.h 22 Sep 2005 12:58:52 -0000 1.1.1.4 +++ simtexth.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: statistics.ui.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/statistics.ui.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- statistics.ui.h 22 Sep 2005 12:58:53 -0000 1.1.1.2 +++ statistics.ui.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: trwindow.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/trwindow.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- trwindow.cpp 22 Sep 2005 12:58:52 -0000 1.1.1.6 +++ trwindow.cpp 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** Index: trwindow.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/trwindow.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- trwindow.h 22 Sep 2005 12:58:52 -0000 1.1.1.4 +++ trwindow.h 23 Sep 2005 09:40:32 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Linguist. ** |
