1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00

Remove patches (forgotten in previous commit)

Feature safe:	yes
This commit is contained in:
Emanuel Haupt 2012-11-13 12:57:39 +00:00
parent 6c46cd0ea9
commit af2f43b111
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=307370
2 changed files with 0 additions and 85 deletions

View File

@ -1,29 +0,0 @@
--- ./plugins/actions/documentsnavigation/documentsnavigation.cc.orig 2011-06-08 19:15:03.000000000 +0200
+++ ./plugins/actions/documentsnavigation/documentsnavigation.cc 2011-07-26 10:12:07.000000000 +0200
@@ -54,22 +54,22 @@
action_group->add(
Gtk::Action::create("documentsnavigation-first-document", Gtk::Stock::GOTO_FIRST, _("_First Document")),
- sigc::bind(
+ sigc::bind<int>(
sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), FIRST));
action_group->add(
Gtk::Action::create("documentsnavigation-last-document", Gtk::Stock::GOTO_LAST, _("_Last Document")),
- sigc::bind(
+ sigc::bind<int>(
sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), LAST));
action_group->add(
Gtk::Action::create("documentsnavigation-previous-document", Gtk::Stock::GO_BACK, _("_Previous Document")),
- sigc::bind(
+ sigc::bind<int>(
sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), PREVIOUS));
action_group->add(
Gtk::Action::create("documentsnavigation-next-document", Gtk::Stock::GO_FORWARD, _("_Next Document")),
- sigc::bind(
+ sigc::bind<int>(
sigc::mem_fun(*this, &DocumentsNavigationPlugin::on_select_document), NEXT));
// ui

View File

@ -1,56 +0,0 @@
--- ./plugins/subtitleformats/sami/sami.cc.orig 2011-06-18 10:05:15.000000000 +0200
+++ ./plugins/subtitleformats/sami/sami.cc 2011-12-14 22:24:57.000000000 +0100
@@ -155,7 +155,7 @@
int state = 0;
Glib::ustring line;
Glib::ustring text;
- Subtitle* curSt;
+ Subtitle curSt;
char tmptext[MAXBUF+1] = "";
char *p = NULL, *q = NULL;
if (!file.getline(line))
@@ -174,8 +174,8 @@
start_sync = utility::string_to_int(inptr + 6);
// Get a line from the current subtitle on memory
- curSt = &subtitles.append();
- curSt->set_start(start_sync);
+ curSt = subtitles.append();
+ curSt.set_start(start_sync);
state = SAMI_STATE_SYNC_START;
continue;
@@ -239,14 +239,14 @@
// Now we are sure that this line is the end sync.
end_sync = utility::string_to_int(q + 6);
- curSt->set_end(end_sync);
+ curSt.set_end(end_sync);
*p = '\0';
trail_space(tmptext);
// finalize the end sync of current line
if (tmptext[0] != '\0')
- curSt->set_text(tmptext);
+ curSt.set_text(tmptext);
// an important check if this is end sync.
// Is there any delimiter "&nbsp;" in this line?
@@ -276,14 +276,14 @@
else
{
end_sync = SAMISYNC_MAXVAL;
- curSt->set_end(end_sync);
+ curSt.set_end(end_sync);
*p = '\0';
trail_space(tmptext);
// finalize the end sync of current line
if (tmptext[0] != '\0')
- curSt->set_text(tmptext);
+ curSt.set_text(tmptext);
state = SAMI_STATE_FORCE_QUIT;
break;