Reset submodule main/libraries/libkexiv2/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "admin"]
+	path = admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

acinclude.m4

@@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
 if test "$1" = "default"; then
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
+    kde_htmldir='\${datadir}/doc/tde/HTML'
   fi
   if test -z "$kde_appsdir"; then
     kde_appsdir='\${datadir}/applnk'

admin

@@ -0,0 +1 @@
+Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

libkexiv2/libkexiv2/kexiv2.cpp

@@ -115,9 +115,9 @@ TQString KExiv2::Exiv2Version()
 #if (EXIV2_TEST_VERSION(0,14,0))
     return TQString(Exiv2::version());
 #else
-    return TQString("%1.%2.%3").tqarg(EXIV2_MAJOR_VERSION)
-                              .tqarg(EXIV2_MINOR_VERSION)
-                              .tqarg(EXIV2_PATCH_VERSION);
+    return TQString("%1.%2.%3").arg(EXIV2_MAJOR_VERSION)
+                              .arg(EXIV2_MINOR_VERSION)
+                              .arg(EXIV2_PATCH_VERSION);
 #endif
 }
 
@@ -1297,7 +1297,7 @@ TQString KExiv2::getExifTagString(const char* exifTagName, bool escapeCR) const
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(TQString("Cannot find Exif key '%1' into image using Exiv2 ")
-                                 .tqarg(exifTagName), e);
+                                 .arg(exifTagName), e);
     }
 
     return TQString();
@@ -1343,7 +1343,7 @@ TQString KExiv2::getIptcTagString(const char* iptcTagName, bool escapeCR) const
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(TQString("Cannot find Iptc key '%1' into image using Exiv2 ")
-                                 .tqarg(iptcTagName), e);
+                                 .arg(iptcTagName), e);
     }
 
     return TQString();
@@ -1383,7 +1383,7 @@ bool KExiv2::getExifTagLong(const char* exifTagName, long &val) const
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(TQString("Cannot find Exif key '%1' into image using Exiv2 ")
-                                 .tqarg(exifTagName), e);
+                                 .arg(exifTagName), e);
     }
 
     return false;
@@ -1413,7 +1413,7 @@ TQByteArray KExiv2::getExifTagData(const char* exifTagName) const
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(TQString("Cannot find Exif key '%1' into image using Exiv2 ")
-                                 .tqarg(exifTagName), e);
+                                 .arg(exifTagName), e);
     }
 
     return TQByteArray();
@@ -1437,7 +1437,7 @@ TQByteArray KExiv2::getIptcTagData(const char *iptcTagName) const
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(TQString("Cannot find Iptc key '%1' into image using Exiv2 ")
-                                 .tqarg(iptcTagName), e);
+                                 .arg(iptcTagName), e);
     }
 
     return TQByteArray();
@@ -1460,7 +1460,7 @@ bool KExiv2::getExifTagRational(const char *exifTagName, long int &num, long int
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(TQString("Cannot find Exif Rational value from key '%1' "
-                                         "into image using Exiv2 ").tqarg(exifTagName), e);
+                                         "into image using Exiv2 ").arg(exifTagName), e);
     }
 
     return false;

libkexiv2/libkexiv2/kexiv2private.cpp

@@ -157,7 +157,7 @@ TQString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)
         }
         else if (charset == "\"Ascii\"")
         {
-            return TQString::tqfromLatin1(comment.c_str());
+            return TQString::fromLatin1(comment.c_str());
         }
         else
         {
@@ -215,12 +215,12 @@ TQString KExiv2Priv::detectEncodingAndDecode(const std::string &value)
         // workaround for bug #134999:
         // The TQLatin15Codec may crash if strlen < value.length()
         int length = value.length();
-        if (localCodec->name() == TQString::tqfromLatin1("ISO 8859-15"))
+        if (localCodec->name() == TQString::fromLatin1("ISO 8859-15"))
             length = strlen(value.c_str());
         return localCodec->toUnicode(value.c_str(), length);
     }
     else
-        return TQString::tqfromLatin1(value.c_str());
+        return TQString::fromLatin1(value.c_str());
 }
 
 }  // NameSpace KExiv2Iface