Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Aug 18th, 2010  |  syntax: C++  |  size: 2.95 KB  |  views: 103  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -ur yawp-0.3.4-old/applet/utils.h yawp-0.3.4/applet/utils.h
  2. --- yawp-0.3.4-old/applet/utils.h       2010-07-07 20:42:28.000000000 +0200
  3. +++ yawp-0.3.4/applet/utils.h   2010-08-18 08:51:10.320000002 +0200
  4. @@ -53,7 +53,7 @@
  5.         inline QString
  6.         GetUnitString( int unit )
  7.         {
  8. -#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
  9. +#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
  10.                 KUnitConversion::Value v(1.0, unit);
  11.                 QString str = v.unit()->symbol();
  12.  #else
  13. @@ -77,4 +77,4 @@
  14.         }
  15.  };
  16.  
  17. -#endif // UTILS_H
  18. \ Pas de fin de ligne à la fin du fichier.
  19. +#endif // UTILS_H
  20. diff -ur yawp-0.3.4-old/applet/weatherdataprocessor.cpp yawp-0.3.4/applet/weatherdataprocessor.cpp
  21. --- yawp-0.3.4-old/applet/weatherdataprocessor.cpp      2010-07-07 20:42:28.000000000 +0200
  22. +++ yawp-0.3.4/applet/weatherdataprocessor.cpp  2010-08-18 08:59:36.186666669 +0200
  23. @@ -643,7 +643,7 @@
  24.  
  25.         if( fromSystem != distanceSystem )
  26.         {
  27. -#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
  28. +#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
  29.                 KUnitConversion::Value v( (double) fValue, fromSystem);
  30.                 fValue = v.convertTo(distanceSystem).number();
  31.  #elif KDE_VERSION_MINOR == 3
  32. @@ -664,7 +664,7 @@
  33.                 return SHRT_MAX;
  34.         if( fromSystem != pressureSystem )
  35.         {
  36. -#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
  37. +#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
  38.                 KUnitConversion::Value v( (double) fValue, fromSystem);
  39.                 fValue = v.convertTo(pressureSystem).number();
  40.  #elif KDE_VERSION_MINOR >= 3
  41. @@ -687,7 +687,7 @@
  42.  
  43.         if( fromSystem != temperatureSystem )
  44.         {
  45. -#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
  46. +#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
  47.                 KUnitConversion::Value v( (double) fValue, fromSystem);
  48.                 fValue = v.convertTo(temperatureSystem).number();
  49.  #elif KDE_VERSION_MINOR >= 3
  50. @@ -709,7 +709,7 @@
  51.  
  52.         if( fromSystem != speedSystem )
  53.         {
  54. -#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
  55. +#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
  56.                 KUnitConversion::Value v( (double) fValue, fromSystem);
  57.                 fValue = v.convertTo(speedSystem).number();
  58.  #elif KDE_VERSION_MINOR >= 3
  59. diff -ur yawp-0.3.4-old/ions/units.h yawp-0.3.4/ions/units.h
  60. --- yawp-0.3.4-old/ions/units.h 2010-07-07 20:42:28.000000000 +0200
  61. +++ yawp-0.3.4/ions/units.h     2010-08-18 09:13:11.533333335 +0200
  62. @@ -26,7 +26,7 @@
  63.  
  64.  
  65.  //#if KDE_IS_VERSION(4,3,70)
  66. -#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR == 4
  67. +#if (KDE_VERSION_MINOR == 3 && KDE_VERSION_RELEASE >= 70) || KDE_VERSION_MINOR >= 4
  68.         #include <KUnitConversion/Converter>
  69.         #define FAHRENHEIT KUnitConversion::Fahrenheit
  70.         #define CELSIUS KUnitConversion::Celsius