Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 152025 Details for
Bug 220493
sci-visualization/quickplot-0.8.13 fails w/ gcc-4.3.0 and with >=libsigc++-2.1
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
quickplot-0.8.13-libsigc++-2.2.2.patch
quickplot-0.8.13-libsigc++-2.2.2.patch (text/plain), 11.83 KB, created by
Peter Alfredsen (RETIRED)
on 2008-05-05 23:00:47 UTC
(
hide
)
Description:
quickplot-0.8.13-libsigc++-2.2.2.patch
Filename:
MIME Type:
Creator:
Peter Alfredsen (RETIRED)
Created:
2008-05-05 23:00:47 UTC
Size:
11.83 KB
patch
obsolete
>diff -NrU5 quickplot-0.8.13.old/Graph.cpp quickplot-0.8.13/Graph.cpp >--- quickplot-0.8.13.old/Graph.cpp 2006-08-05 17:45:34.000000000 +0200 >+++ quickplot-0.8.13/Graph.cpp 2008-05-06 00:42:00.000000000 +0200 >@@ -1178,34 +1178,34 @@ > gtk_idle_add(GraphTab_deleteLater, &deleteLater); > } > > > >-SigC::Signal1<void, Graph *> Graph::signal_addedPlot(void) >+sigc::signal1<void, Graph *> Graph::signal_addedPlot(void) > { > return m_signal_addedPlot; > } > >-SigC::Signal2<void, Graph *, Plot *> Graph::signal_removedPlot(void) >+sigc::signal2<void, Graph *, Plot *> Graph::signal_removedPlot(void) > { > return m_signal_removedPlot; > } > >-SigC::Signal1<void, Graph *> Graph::m_signal_addedPlot; >+sigc::signal1<void, Graph *> Graph::m_signal_addedPlot; > >-SigC::Signal2<void, Graph *, Plot *> Graph::m_signal_removedPlot; >+sigc::signal2<void, Graph *, Plot *> Graph::m_signal_removedPlot; > > > >-SigC::Signal1<void, Graph *> Graph::signal_changedSameScale(void) >+sigc::signal1<void, Graph *> Graph::signal_changedSameScale(void) > { > return m_signal_changedSameScale; > } > >-SigC::Signal1<void, Graph *> Graph::m_signal_changedSameScale; >+sigc::signal1<void, Graph *> Graph::m_signal_changedSameScale; > > >-SigC::Signal0<void> Graph::signal_backgroundColorChanged(void) >+sigc::signal0<void> Graph::signal_backgroundColorChanged(void) > { > return m_signal_backgroundColorChanged; > } > >diff -NrU5 quickplot-0.8.13.old/Graph.h quickplot-0.8.13/Graph.h >--- quickplot-0.8.13.old/Graph.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/Graph.h 2008-05-06 00:41:49.000000000 +0200 >@@ -66,14 +66,14 @@ > bool showGridNumbers; > > inline bool isShowingGrid() { return (showAutoGrid && isSameScale); } > /************************************************************/ > >- static SigC::Signal1<void, Graph *> signal_changedSameScale(void); >- static SigC::Signal1<void, Graph *> signal_addedPlot(void); >- static SigC::Signal2<void, Graph *, Plot *> signal_removedPlot(void); >- SigC::Signal0<void> signal_backgroundColorChanged(void); >+ static sigc::signal1<void, Graph *> signal_changedSameScale(void); >+ static sigc::signal1<void, Graph *> signal_addedPlot(void); >+ static sigc::signal2<void, Graph *, Plot *> signal_removedPlot(void); >+ sigc::signal0<void> signal_backgroundColorChanged(void); > > > Gdk::Color gridColor, backgroundColor; > > int gridXLineSpace, gridYLineSpace, gridLineWidth; >@@ -103,16 +103,16 @@ > > void setPickerType(void); > > void setStatusXYValues(gdouble x, gdouble y); > >- static SigC::Signal1<void, Graph *> m_signal_changedSameScale; >+ static sigc::signal1<void, Graph *> m_signal_changedSameScale; > >- static SigC::Signal1<void, Graph *> m_signal_addedPlot; >- static SigC::Signal2<void, Graph *, Plot *> m_signal_removedPlot; >+ static sigc::signal1<void, Graph *> m_signal_addedPlot; >+ static sigc::signal2<void, Graph *, Plot *> m_signal_removedPlot; > >- SigC::Signal0<void> m_signal_backgroundColorChanged; >+ sigc::signal0<void> m_signal_backgroundColorChanged; > > > // used by createPlot(Field *x, Field *y) > void checkZoomLevelForNewPlot(Plot *plot); > >diff -NrU5 quickplot-0.8.13.old/MainWindow.cpp quickplot-0.8.13/MainWindow.cpp >--- quickplot-0.8.13.old/MainWindow.cpp 2006-08-07 20:12:11.000000000 +0200 >+++ quickplot-0.8.13/MainWindow.cpp 2008-05-06 00:42:00.000000000 +0200 >@@ -758,10 +758,10 @@ > d->to= this; > d->from = graphsNotebook; > gtk_idle_add(copyGraphNotebooks, d); > } > >-SigC::Signal1<void, Graph *> GraphsNotebook::signal_tabLabelChanged(void) >+sigc::signal1<void, Graph *> GraphsNotebook::signal_tabLabelChanged(void) > { > return m_signal_tabLabelChanged; > } > >diff -NrU5 quickplot-0.8.13.old/MainWindow.h quickplot-0.8.13/MainWindow.h >--- quickplot-0.8.13.old/MainWindow.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/MainWindow.h 2008-05-06 00:41:49.000000000 +0200 >@@ -17,12 +17,12 @@ > // to "signal" the View Menu in MainMenuBar.cpp, to add a runtime > // "show/hide tabs option. Is there a signal_show_tabs() or like > // method??? It's not listed. > void set_show_tabs(bool show_tabs = true); > >- SigC::Signal1<void, Graph *> signal_tabLabelChanged(void); >- SigC::Signal1<void, Graph *> m_signal_tabLabelChanged; >+ sigc::signal1<void, Graph *> signal_tabLabelChanged(void); >+ sigc::signal1<void, Graph *> m_signal_tabLabelChanged; > > private: > MainWindow *mainWindow; > }; > >diff -NrU5 quickplot-0.8.13.old/PlotConfig.h quickplot-0.8.13/PlotConfig.h >--- quickplot-0.8.13.old/PlotConfig.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/PlotConfig.h 2008-05-06 00:41:49.000000000 +0200 >@@ -50,11 +50,11 @@ > CheckButton showPointsCB; > Button pointColorB; > ValueSlider pointSizeVS; > // RadioButton style1, style2 etc ... > >- SigC::Connection plotChanged_connection; >+ sigc::connection plotChanged_connection; > > void setValues(void); > > // slots > void on_plotChanged(void); >diff -NrU5 quickplot-0.8.13.old/Plot.cpp quickplot-0.8.13/Plot.cpp >--- quickplot-0.8.13.old/Plot.cpp 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/Plot.cpp 2008-05-06 00:42:00.000000000 +0200 >@@ -501,11 +501,11 @@ > m_signal_changed.emit(); > } > > // Emitted when the lineColor, pointColor, lineWidth or pointSize > // changes. >-SigC::Signal0<void> Plot::signal_changed(void) >+sigc::signal0<void> Plot::signal_changed(void) > { > return m_signal_changed; > } > > // pick a Y value. >@@ -661,11 +661,11 @@ > xpick = (X - currentZoomLevel->shiftX)/currentZoomLevel->scaleX; > ypick = (Y - currentZoomLevel->shiftY)/currentZoomLevel->scaleY; > m_signal_valueDisplay.emit(xpick, ypick); > } > >-SigC::Signal2<void, value_t, value_t> Plot::signal_valueDisplay(void) >+sigc::signal2<void, value_t, value_t> Plot::signal_valueDisplay(void) > { > return m_signal_valueDisplay; > } > > >diff -NrU5 quickplot-0.8.13.old/Plot.h quickplot-0.8.13/Plot.h >--- quickplot-0.8.13.old/Plot.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/Plot.h 2008-05-06 00:41:49.000000000 +0200 >@@ -99,30 +99,30 @@ > > Graph *graph; > > // Emitted when the lineColor, pointColor, lineWidth, pointSize, > // showLines and showPoints. >- SigC::Signal0<void> signal_changed(void); >+ sigc::signal0<void> signal_changed(void); > > > int emitDisplayValues(int X); > void emitInterpolatedDisplayValues(int X); > void emitDisplayValues(int X, int Y); > >- SigC::Signal2<void, value_t, value_t> signal_valueDisplay(void); >+ sigc::signal2<void, value_t, value_t> signal_valueDisplay(void); > > value_t xpick, ypick; > > protected: > > private: > > bool showPoints, showLines; > >- SigC::Signal0<void> m_signal_changed; >+ sigc::signal0<void> m_signal_changed; > >- SigC::Signal2<void, value_t, value_t> m_signal_valueDisplay; >+ sigc::signal2<void, value_t, value_t> m_signal_valueDisplay; > > Gdk::Color lineColor, pointColor; > > // Cull and Draw. > void cullDrawLine(value_t fromX, value_t fromY, value_t toX, value_t toY); >diff -NrU5 quickplot-0.8.13.old/PlotLister.h quickplot-0.8.13/PlotLister.h >--- quickplot-0.8.13.old/PlotLister.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/PlotLister.h 2008-05-06 00:41:49.000000000 +0200 >@@ -22,11 +22,11 @@ > bool limitSize; > > Glib::RefPtr<Gdk::Window> win; > Glib::RefPtr<Gdk::GC> gc; > >- SigC::Connection plotChangeConnection, bgConnection; >+ sigc::connection plotChangeConnection, bgConnection; > }; > > > > class Row >@@ -50,18 +50,18 @@ > > int row; > Table *table; > MainWindow *mainWindow; > Plot *plot; >- SigC::Connection valueDisplay_connection, makePlotConfig_connection; >+ sigc::connection valueDisplay_connection, makePlotConfig_connection; > > void add(Widget &w, int col); > void makePlotConfig(void); > //void setLabelSize(Entry &l); > //void afterRealize(void); > >- //SigC::Connection afterRealizeConnection; >+ //sigc::connection afterRealizeConnection; > }; > > > > class PlotLister : public Window >diff -NrU5 quickplot-0.8.13.old/Source.cpp quickplot-0.8.13/Source.cpp >--- quickplot-0.8.13.old/Source.cpp 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/Source.cpp 2008-05-06 00:42:00.000000000 +0200 >@@ -205,20 +205,20 @@ > { > gtk_idle_add(deleteSLater, &dl); > } > > >-SigC::Signal1<void, Source *> Source::signal_addedSource() >+sigc::signal1<void, Source *> Source::signal_addedSource() > { > return m_signal_addedSource; > } > >-SigC::Signal1<void, Source *> Source::m_signal_addedSource; >+sigc::signal1<void, Source *> Source::m_signal_addedSource; > > >-SigC::Signal1<void, Source *> Source::signal_removedSource() >+sigc::signal1<void, Source *> Source::signal_removedSource() > { > return m_signal_removedSource; > } > >-SigC::Signal1<void, Source *> Source::m_signal_removedSource; >+sigc::signal1<void, Source *> Source::m_signal_removedSource; > >diff -NrU5 quickplot-0.8.13.old/Source.h quickplot-0.8.13/Source.h >--- quickplot-0.8.13.old/Source.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/Source.h 2008-05-06 00:41:49.000000000 +0200 >@@ -48,23 +48,23 @@ > > > inline const enum TYPE getType(void){ return type; } > inline const char *getTypeString(void){ return TYPE_STRING[type]; } > >- static SigC::Signal1<void, Source *> signal_addedSource(); >- static SigC::Signal1<void, Source *> signal_removedSource(); >+ static sigc::signal1<void, Source *> signal_addedSource(); >+ static sigc::signal1<void, Source *> signal_removedSource(); > > // Delete this object later. > void deleteLater(void); > > std::list<CloseSourceMenuItem *> closeSourceMenuItems; > > > protected: > >- static SigC::Signal1<void, Source *> m_signal_addedSource; >- static SigC::Signal1<void, Source *> m_signal_removedSource; >+ static sigc::signal1<void, Source *> m_signal_addedSource; >+ static sigc::signal1<void, Source *> m_signal_removedSource; > > inline void setType(enum TYPE t) { type = t; } > char *fileName, *baseFileName; > void addCloseMenus(const char *label); > >diff -NrU5 quickplot-0.8.13.old/ValueSlider.cpp quickplot-0.8.13/ValueSlider.cpp >--- quickplot-0.8.13.old/ValueSlider.cpp 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/ValueSlider.cpp 2008-05-06 00:42:00.000000000 +0200 >@@ -173,11 +173,11 @@ > else > return false; // no value change > } > } > >-SigC::Signal0<void> ValueSlider::signal_valueChanged() >+sigc::signal0<void> ValueSlider::signal_valueChanged() > { > return m_signal_valueChanged; > } > > >@@ -327,11 +327,11 @@ > else > return false; // no value change > } > } > >-SigC::Signal0<void> DoubleValueSlider::signal_valueChanged() >+sigc::signal0<void> DoubleValueSlider::signal_valueChanged() > { > return m_signal_valueChanged; > } > > >@@ -477,10 +477,10 @@ > int LogValueSlider::getValue(void) > { > return (int) pow(10.0, value); > } > >-SigC::Signal0<void> LogValueSlider::signal_valueChanged() >+sigc::signal0<void> LogValueSlider::signal_valueChanged() > { > return m_signal_valueChanged; > } > >diff -NrU5 quickplot-0.8.13.old/ValueSlider.h quickplot-0.8.13/ValueSlider.h >--- quickplot-0.8.13.old/ValueSlider.h 2006-08-03 22:56:56.000000000 +0200 >+++ quickplot-0.8.13/ValueSlider.h 2008-05-06 00:41:49.000000000 +0200 >@@ -18,14 +18,14 @@ > > int value; > double maxmax; > > public: >- SigC::Signal0<void> signal_valueChanged(); >+ sigc::signal0<void> signal_valueChanged(); > > private: >- SigC::Signal0<void> m_signal_valueChanged; >+ sigc::signal0<void> m_signal_valueChanged; > > bool setScaleToEntry(void); > > bool setEntryToScale(void); > >@@ -51,14 +51,14 @@ > Entry entry; > > double value, maxmax; > > public: >- SigC::Signal0<void> signal_valueChanged(); >+ sigc::signal0<void> signal_valueChanged(); > > private: >- SigC::Signal0<void> m_signal_valueChanged; >+ sigc::signal0<void> m_signal_valueChanged; > > bool setScaleToEntry(void); > > bool setEntryToScale(void); > >@@ -86,14 +86,14 @@ > > // log of getValue() > double value; > > public: >- SigC::Signal0<void> signal_valueChanged(); >+ sigc::signal0<void> signal_valueChanged(); > > private: >- SigC::Signal0<void> m_signal_valueChanged; >+ sigc::signal0<void> m_signal_valueChanged; > > bool setScaleToEntry(void); > > bool setEntryToScale(void); >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=152025">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 220493
:
152023
| 152025 |
152027
