X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockmanager.cpp;h=a280a325621840a0b20d2375ea71c1ac3fe183df;hb=e7e1794959f6b4af0d60d69b5501adcd305f2207;hp=92aef31c044a8d062b4896d2715f577c0849a7ff;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
index 92aef31..a280a32 100644
--- a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
@@ -5,16 +5,17 @@
 **	$Id: dockmanager.cpp,v 1.2 2005/01/12 07:03:42 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package 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
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -72,7 +73,7 @@ public:
 		if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")try
 		{
 			synfig::String key(key_.begin()+7,key_.end());
-			int separator=key.find_first_of('.');
+			synfig::String::size_type separator=key.find_first_of('.');
 			int id(atoi(synfig::String(key.begin(),key.begin()+separator).c_str()));
 			key=synfig::String(key.begin()+separator+1,key.end());
 			
@@ -122,7 +123,7 @@ public:
 		if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")
 		{
 			synfig::String key(key_.begin()+7,key_.end());
-			int separator=key.find_first_of('.');
+			synfig::String::size_type separator=key.find_first_of('.');
 			int id(atoi(synfig::String(key.begin(),key.begin()+separator).c_str()));
 			key=synfig::String(key.begin()+separator+1,key.end());
 			
@@ -133,7 +134,7 @@ public:
 				try {
 					
 				vector<int> data;
-				int n=0;
+				String::size_type n=0;
 				String value_(value);
 				while(value_.size() && (signed)value_.size()>n && n>=0){
 					value_=String(value_.begin()+n,value_.end());
@@ -144,7 +145,7 @@ public:
 					data.push_back(size);
 
 					n=value_.find(" ");
-					if((unsigned)n!=String::npos)
+					if(n!=String::npos)
 						n++;
 						
 				}