clean code:remove unnecessary typedef

xiaoyifang · Apr 5, 2022 · 64d989f · 64d989f
1 parent 4283b25
commit 64d989f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/config.cc b/config.cc
@@ -395,17 +395,17 @@ Group loadGroup( QDomElement grp, unsigned * nextId = 0 )
 
   QDomNodeList dicts = grp.elementsByTagName( "dictionary" );
 
-  for( Utils::Dom::size_type y = 0; y < dicts.length(); ++y )
+  for( int y = 0; y < dicts.length(); ++y )
     g.dictionaries.push_back( DictionaryRef( dicts.item( y ).toElement().text(),
                                              dicts.item( y ).toElement().attribute( "name" ) ) );
 
   QDomNode muted = grp.namedItem( "mutedDictionaries" );
   dicts = muted.toElement().elementsByTagName( "mutedDictionary" );
-  for( Utils::Dom::size_type x = 0; x < dicts.length(); ++x )
+  for( int x = 0; x < dicts.length(); ++x )
     g.mutedDictionaries.insert( dicts.item( x ).toElement().text() );
 
   dicts = muted.toElement().elementsByTagName( "popupMutedDictionary" );
-  for( Utils::Dom::size_type x = 0; x < dicts.length(); ++x )
+  for( int x = 0; x < dicts.length(); ++x )
     g.popupMutedDictionaries.insert( dicts.item( x ).toElement().text() );
 
   return g;
@@ -420,7 +420,7 @@ MutedDictionaries loadMutedDictionaries( QDomNode mutedDictionaries )
     QDomNodeList nl = mutedDictionaries.toElement().
                         elementsByTagName( "mutedDictionary" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
       result.insert( nl.item( x ).toElement().text() );
   }
 
@@ -583,7 +583,7 @@ Class load()
   {
     QDomNodeList nl = paths.toElement().elementsByTagName( "path" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
       c.paths.push_back(
         Path( nl.item( x ).toElement().text(),
               nl.item( x ).toElement().attribute( "recursive" ) == "1" ) );
@@ -595,7 +595,7 @@ Class load()
   {
     QDomNodeList nl = soundDirs.toElement().elementsByTagName( "sounddir" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
       c.soundDirs.push_back(
         SoundDir( nl.item( x ).toElement().text(),
                   nl.item( x ).toElement().attribute( "name" ),
@@ -620,7 +620,7 @@ Class load()
 
     QDomNodeList nl = groups.toElement().elementsByTagName( "group" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
     {
       QDomElement grp = nl.item( x ).toElement();
 
@@ -636,7 +636,7 @@ Class load()
 
     QDomNodeList nl = hunspell.toElement().elementsByTagName( "enabled" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
       c.hunspell.enabledDictionaries.push_back( nl.item( x ).toElement().text() );
   }
 
@@ -700,7 +700,7 @@ Class load()
   {
     QDomNodeList nl = programs.toElement().elementsByTagName( "program" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
     {
       QDomElement pr = nl.item( x ).toElement();
 
@@ -727,7 +727,7 @@ Class load()
   {
     QDomNodeList nl = mws.toElement().elementsByTagName( "mediawiki" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
     {
       QDomElement mw = nl.item( x ).toElement();
 
@@ -755,7 +755,7 @@ Class load()
   {
     QDomNodeList nl = wss.toElement().elementsByTagName( "website" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
     {
       QDomElement ws = nl.item( x ).toElement();
 
@@ -783,7 +783,7 @@ Class load()
   {
     QDomNodeList nl = dss.toElement().elementsByTagName( "server" );
 
-    for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for( int x = 0; x < nl.length(); ++x )
     {
       QDomElement ds = nl.item( x ).toElement();
 
@@ -812,7 +812,7 @@ Class load()
   {
     QDomNodeList nl = ves.toElement().elementsByTagName( "voiceEngine" );
 
-    for ( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+    for ( int x = 0; x < nl.length(); ++x )
     {
       QDomElement ve = nl.item( x ).toElement();
       VoiceEngine v;

diff --git a/forvo.cc b/forvo.cc
@@ -224,7 +224,7 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 
             articleBody += "<table class=\"forvo_play\">";
 
-            for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+            for( int x = 0; x < nl.length(); ++x )
             {
               QDomElement item = nl.item( x ).toElement();
 

diff --git a/mediawiki.cc b/mediawiki.cc
@@ -185,7 +185,7 @@ void MediaWikiWordSearchRequest::downloadFinished()
 
         Mutex::Lock _( dataMutex );
 
-        for( Utils::Dom::size_type x = 0; x < nl.length(); ++x )
+        for( int x = 0; x < nl.length(); ++x )
           matches.push_back( gd::toWString( nl.item( x ).toElement().attribute( "title" ) ) );
       }
     }

diff --git a/utils.hh b/utils.hh
@@ -146,11 +146,6 @@ inline QString getWordFromUrl( const QUrl & url )
 }
 }
 
-namespace Dom
-{
-  typedef int size_type;
-}
-
 }
 
 #endif // UTILS_HH