API tools faq
paste
Advertisement
hobbes1069

GCC 4.6 - Taking address of a temporary patch

hobbes1069
May 10th, 2011
439
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.95 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp
  2. --- avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp   2010-06-06 18:04:21.000000000 -0500
  3. +++ avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp    2011-04-19 14:15:09.330729997 -0500
  4. @@ -138,7 +138,7 @@
  5.         *configType = (ConfigMenuType)combobox->itemData(combobox->currentIndex()).toInt();
  6.     }
  7.  
  8. -   bool ADM_QconfigMenu::selectConfiguration(QString *selectFile, ConfigMenuType configurationType)
  9. +   bool ADM_QconfigMenu::selectConfiguration(const QString &selectFile, ConfigMenuType configurationType)
  10.     {
  11.         bool success = false;
  12.         bool origDisableGenericSlots = disableGenericSlots;
  13. @@ -210,7 +210,7 @@
  14.                 delete [] configData;
  15.  
  16.                 fillConfigurationComboBox();
  17. -               selectConfiguration(&QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);
  18. +               selectConfiguration(QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);
  19.             }
  20.         }
  21.     }
  22. @@ -316,7 +316,7 @@
  23.     {
  24.         ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget;
  25.  
  26. -       configMenu->selectConfiguration(&QString(configName), *configType);
  27. +       configMenu->selectConfiguration(QString(configName), *configType);
  28.     }
  29.  
  30.     void diaElemConfigMenu::finalize(void)
  31. @@ -356,7 +356,7 @@
  32.             }
  33.         }
  34.  
  35. -       configMenu->selectConfiguration(&QString(configName), *configType);
  36. +       configMenu->selectConfiguration(QString(configName), *configType);
  37.     }
  38.  }
  39.  
  40. diff -Naur avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h
  41. --- avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h 2009-07-30 13:38:30.000000000 -0500
  42. +++ avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h  2011-04-19 14:15:38.299090636 -0500
  43. @@ -46,7 +46,7 @@
  44.         ~ADM_QconfigMenu();
  45.  
  46.         void getConfiguration(char *configName, ConfigMenuType *configType);
  47. -       bool selectConfiguration(QString *selectFile, ConfigMenuType configurationType);
  48. +       bool selectConfiguration(const QString &selectFile, ConfigMenuType configurationType);
  49.     };
  50.  }
  51.  #endif // T_configMenu_h
  52. diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
  53. --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp   2010-09-29 15:20:48.000000000 -0500
  54. +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp    2011-04-19 15:03:33.459339339 -0500
  55. @@ -209,7 +209,7 @@
  56.     disableGenericSlots = origDisableGenericSlots;
  57.  }
  58.  
  59. -bool x264ConfigDialog::selectConfiguration(QString *selectFile, PluginConfigType configurationType)
  60. +bool x264ConfigDialog::selectConfiguration(const QString &selectFile, PluginConfigType configurationType)
  61.  {
  62.     bool success = false;
  63.     bool origDisableGenericSlots = disableGenericSlots;
  64. @@ -343,7 +343,7 @@
  65.         delete [] xml;
  66.  
  67.         fillConfigurationComboBox();
  68. -       selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
  69. +       selectConfiguration(QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
  70.     }
  71.  
  72.     delete [] configDirectory;
  73. @@ -580,7 +580,7 @@
  74.     disableGenericSlots = true;
  75.     options->getPresetConfiguration(&configurationName, &configurationType);
  76.  
  77. -   bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
  78. +   bool foundConfig = selectConfiguration(QString(configurationName), configurationType);
  79.  
  80.     if (!foundConfig)
  81.         printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);
  82. diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h
  83. --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h 2010-09-29 15:20:48.000000000 -0500
  84. +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h  2011-04-19 15:03:52.825582656 -0500
  85. @@ -46,7 +46,7 @@
  86.     uint8_t intra8x8Luma[64], inter8x8Luma[64];
  87.  
  88.     void fillConfigurationComboBox(void);
  89. -   bool selectConfiguration(QString *selectFile, PluginConfigType configurationType);
  90. +   bool selectConfiguration(const QString &selectFile, PluginConfigType configurationType);
  91.     bool loadPresetSettings(vidEncOptions *encodeOptions, x264Options *options);
  92.     void loadSettings(vidEncOptions *encodeOptions, x264Options *options);
  93.     int getValueIndexInArray(uint8_t value, const uint8_t valueArray[], int elementCount);
  94. diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp
  95. --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp   2010-06-06 18:07:37.000000000 -0500
  96. +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp    2011-04-19 14:36:49.467456165 -0500
  97. @@ -129,7 +129,7 @@
  98.     disableGenericSlots = origDisableGenericSlots;
  99.  }
  100.  
  101. -bool XvidConfigDialog::selectConfiguration(QString *selectFile, PluginConfigType configurationType)
  102. +bool XvidConfigDialog::selectConfiguration(const QString &selectFile, PluginConfigType configurationType)
  103.  {
  104.     bool success = false;
  105.     bool origDisableGenericSlots = disableGenericSlots;
  106. @@ -233,7 +233,7 @@
  107.         delete [] xml;
  108.  
  109.         fillConfigurationComboBox();
  110. -       selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
  111. +       selectConfiguration(QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
  112.     }
  113.  
  114.     delete [] configDirectory;
  115. @@ -373,7 +373,7 @@
  116.     disableGenericSlots = true;
  117.     options->getPresetConfiguration(&configurationName, &configurationType);       
  118.  
  119. -   bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
  120. +   bool foundConfig = selectConfiguration(QString(configurationName), configurationType);
  121.  
  122.     if (!foundConfig)
  123.         printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);
  124. diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h
  125. --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h 2009-08-03 11:24:09.000000000 -0500
  126. +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h  2011-04-19 14:38:00.253653291 -0500
  127. @@ -26,7 +26,7 @@
  128.     unsigned char intraMatrix[64], interMatrix[64];
  129.  
  130.     void fillConfigurationComboBox(void);
  131. -   bool selectConfiguration(QString *selectFile, PluginConfigType configurationType);
  132. +   bool selectConfiguration(const QString &selectFile, PluginConfigType configurationType);
  133.     bool loadPresetSettings(vidEncOptions *encodeOptions, XvidOptions *options);
  134.     void loadSettings(vidEncOptions *encodeOptions, XvidOptions *options);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!