[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdelibs4_snapshot/kdecore
From:       David Faure <faure () kde ! org>
Date:       2006-06-29 14:01:59
Message-ID: 1151589719.994668.24651.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 556176 by dfaure:

backport organizationDomain() fix, for kig startup


 M  +7 -3      kaboutdata.cpp  
 M  +3 -0      tests/kconfigtest.cpp  


--- branches/work/kdelibs4_snapshot/kdecore/kaboutdata.cpp #556175:556176
@@ -174,7 +174,7 @@
     QString customAuthorPlainText, customAuthorRichText;
     bool customAuthorTextEnabled;
     const char *mTranslatedProgramName;
-    const char *organizationDomain;
+    QString organizationDomain;
 };
 
 
@@ -211,8 +211,12 @@
    if ( homePageAddress && strncmp( homePageAddress, "http://", 7 ) == 0 ) {
        const QByteArray addr = homePageAddress;
        const int dot = addr.indexOf( '.' );
-       if ( dot > -1 )
+       if ( dot > -1 ) {
            d->organizationDomain = homePageAddress + dot + 1;
+           const int slash = d->organizationDomain.indexOf( '/' );
+           if ( slash > -1 )
+               d->organizationDomain.truncate( slash );
+       }
        else
            d->organizationDomain = "kde.org";
    } else
@@ -439,7 +443,7 @@
 QString
 KAboutData::organizationDomain() const
 {
-    return QLatin1String(d->organizationDomain);
+    return d->organizationDomain;
 }
 
 
--- branches/work/kdelibs4_snapshot/kdecore/tests/kconfigtest.cpp #556175:556176
@@ -382,4 +382,7 @@
     KAboutData data( "app", "program", "version", 0, KAboutData::License_LGPL,
                      0, "hello world", "http://www.koffice.org" );
     QCOMPARE( data.organizationDomain(), QString::fromLatin1( "koffice.org" ) );
+    KAboutData data2( "app", "program", "version", 0, KAboutData::License_LGPL,
+                     0, "hello world", "http://edu.kde.org/kig" );
+    QCOMPARE( data2.organizationDomain(), QString::fromLatin1( "kde.org" ) );
 }
[prev in list] [next in list] [prev in thread] [next in thread]