Git commit 57cad1a50aa8c5c239d5ace5eb9be476d56acbaa by Laszlo Papp. Committed on 01/08/2011 at 03:31. Pushed by lpapp into branch 'master'. Fix the include guard and tr/i18n issue in the abstractjob header M +4 -4 player/lib/abstractjob.h http://commits.kde.org/gluon/57cad1a50aa8c5c239d5ace5eb9be476d56acbaa diff --git a/player/lib/abstractjob.h b/player/lib/abstractjob.h index 8709bcf..4ee2f70 100644 --- a/player/lib/abstractjob.h +++ b/player/lib/abstractjob.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GLUONPLAYER_ABSTRACTJOB_H -#define GLUONPLAYER_ABSTRACTJOB_H +#ifndef GLUON_PLAYER_ABSTRACTJOB_H +#define GLUON_PLAYER_ABSTRACTJOB_H #include #include @@ -263,12 +263,12 @@ public: * * Example for errid == ERR_CANNOT_OPEN_FOR_READING: * \code - * i18n( "Could not read\n%1" , errorText() ); + * tr( "Could not read\n%1" , errorText() ); * \endcode * Only call if error is not 0. * * @return the error message and if there is no error, a message - * telling the user that the app is broken, so check with + * telling the user that the application is broken, so check with * error() whether there is an error */ virtual QString errorString() const;