smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 09:36:33 +01:00
Code Issues Projects Releases Wiki Activity

switch glibmm/giomm to 2.18

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5306 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-07-02 16:00:45 +00:00
parent e6c240a691
commit a73d15e989
423 changed files with 142369 additions and 23979 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libs/glibmm2/glib/glibmm/ustring.h
View file

@ -2,21 +2,21 @@
#ifndef _GLIBMM_USTRING_H
#define _GLIBMM_USTRING_H
/* $Id: ustring.h 779 2009-01-19 17:58:50Z murrayc $ */
/* $Id: ustring.h 749 2008-12-10 14:23:33Z jjongsma $ */
/* Copyright (C) 2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@ -608,13 +608,6 @@ public:
//! @name Message formatting.
//! @{
/* Returns fmt as is, but checks for invalid references in the format string.
* @newin2p18
*/
template <class T1>
static inline
ustring compose(const ustring& fmt);
/*! Substitute placeholders in a format string with the referenced arguments.
* The template string should be in <tt>qt-format</tt>, that is
* <tt>"%1"</tt>, <tt>"%2"</tt>, ..., <tt>"%9"</tt> are used as placeholders
@ -1307,13 +1300,6 @@ public:
inline const ustring* ptr() const { return &string_; }
};
template <class T1>
inline // static
ustring ustring::compose(const ustring& fmt)
{
return ustring::compose_argv(fmt, 0, 0);
}
template <class T1>
inline // static
ustring ustring::compose(const ustring& fmt, const T1& a1)