Commit 2c7cfd85 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Mark all const_cast<> work-arounds for the Gtk::TextIter API bug with //

* src/filebuffer.cc: Mark all const_cast<> work-arounds for the
Gtk::TextIter API bug with // XXX comments.
(FileBuffer::get_match_index): Get rid of libstdc++-v2 work-around.

* src/filebuffer.h (FileBuffer): Get rid of the friend declarations
that were added to work around a GCC 2.95 deficiency.
* src/filetree.h (FileTree): ditto
* src/mainwindow.h (MainWindow): ditto.
parent ee38f241
2004-05-17 Daniel Elstner <daniel.elstner@gmx.net>
* src/filebuffer.cc: Mark all const_cast<> work-arounds for the
Gtk::TextIter API bug with // XXX comments.
(FileBuffer::get_match_index): Get rid of libstdc++-v2 work-around.
* src/filebuffer.h (FileBuffer): Get rid of the friend declarations
that were added to work around a GCC 2.95 deficiency.
* src/filetree.h (FileTree): ditto
* src/mainwindow.h (MainWindow): ditto.
2004-05-17 Daniel Elstner <daniel.elstner@gmx.net>
* Makefile.am (install-schemas): Simplify. Since regexxer.schemas
......
......@@ -351,10 +351,7 @@ int FileBuffer::get_match_count() const
int FileBuffer::get_match_index() const
{
// Stupid work-around for silly, silly gcc 2.95.x.
const MatchSet::const_iterator current_match (current_match_);
return (!match_removed_ && current_match != match_set_.end()) ? (*current_match)->index : 0;
return (!match_removed_ && current_match_ != match_set_.end()) ? (*current_match_)->index : 0;
}
int FileBuffer::get_original_match_count() const
......@@ -794,7 +791,7 @@ void FileBuffer::replace_match(MatchSet::const_iterator pos, const Glib::ustring
void FileBuffer::remove_match_at_iter(const FileBuffer::iterator& start)
{
typedef std::list< Glib::RefPtr<Mark> > MarkList;
const MarkList marks (const_cast<iterator&>(start).get_marks());
const MarkList marks (const_cast<iterator&>(start).get_marks()); // XXX
for (MarkList::const_iterator pmark = marks.begin(); pmark != marks.end(); ++pmark)
{
......@@ -890,7 +887,7 @@ void FileBuffer::apply_tag_current()
bool FileBuffer::is_match_start(const iterator& where)
{
typedef std::list< Glib::RefPtr<Mark> > MarkList;
const MarkList marks (const_cast<iterator&>(where).get_marks());
const MarkList marks (const_cast<iterator&>(where).get_marks()); // XXX
return (std::find_if(marks.begin(), marks.end(), &MatchData::is_match_mark) != marks.end());
}
......
......@@ -121,9 +121,6 @@ private:
void update_bound_state();
void notify_weak_undos();
// Work-around for silly, stupid, and annoying gcc 2.95.x.
friend class FileBuffer::ScopedLock;
};
} // namespace Regexxer
......
......@@ -153,10 +153,6 @@ private:
void load_file_with_fallback(const Gtk::TreeModel::iterator& iter, const FileInfoPtr& fileinfo);
void on_conf_value_changed(const Glib::ustring& key, const Gnome::Conf::Value& value);
// Work-around for silly, stupid, and annoying gcc 2.95.x.
friend class FileTree::ScopedBlockSorting;
friend class FileTree::BufferActionShell;
};
......
......@@ -149,9 +149,6 @@ private:
void on_pref_dialog_hide();
void on_conf_value_changed(const Glib::ustring& key, const Gnome::Conf::Value& value);
// Work-around for silly, stupid, and annoying gcc 2.95.x.
friend class MainWindow::BusyAction;
};
} // namespace Regexxer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment