Reset submodule main/applications/internet/kopete-otr/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

configure.in

@@ -48,6 +48,8 @@ dnl generate the config header
 AM_CONFIG_HEADER(config.h) dnl at the distribution this done
 
 dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
 AC_CHECK_COMPILERS
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
@@ -71,11 +73,11 @@ AC_C_BIGENDIAN
 
 AC_CHECK_KDEMAXPATHLEN
 # Make sure that kde includes, etc. are part of the CPPFLAGS ...
-CPPFLAGS="$CPPFLAGS $all_includes -I$kde_includes/kopete"
+CPPFLAGS="$CPPFLAGS $all_includes -I$kde_includes/kopete -I$kde_includes/kde/kopete"
 
 
 # check for libkopete headers and library
-AC_CHECK_HEADER(kopeteversion.h,,
+KDE_CHECK_HEADER(kopeteversion.h,,
                 AC_MSG_ERROR([libkopete header files missing]))
 
 #AC_CHECK_LIB([kopete], [_ZN6Kopete7AccountD0Ev],,

src/otrlchatinterface.cpp

@@ -175,7 +175,7 @@ static void protocol_name_free(void *opdata, const char *protocol_name){
 static void new_fingerprint(void *opdata, OtrlUserState us, const char *accountname, const char *protocol, const char *username, unsigned char fingerprint[20]){
 	kdDebug() << "Received a new Fingerprint" << endl;
 	Kopete::ChatSession *session= ((Kopete::ChatSession*)opdata);
-	Kopete::Message msg( session->members().getFirst(), session->account()->myself(), i18n("<b>Received a new fingerprint from <a>%1</a>. You should authenticate this contact.</b>").tqarg( session->members().getFirst()->contactId() ), Kopete::Message::Internal, Kopete::Message::RichText  );	
+	Kopete::Message msg( session->members().getFirst(), session->account()->myself(), i18n("<b>Received a new fingerprint from <a>%1</a>. You should authenticate this contact.</b>").arg( session->members().getFirst()->contactId() ), Kopete::Message::Internal, Kopete::Message::RichText  );	
 	session->appendMessage( msg );
 }
 
@@ -300,7 +300,7 @@ int OtrlChatInterface::decryptMessage( TQString *msg, TQString accountId,
 
 	tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
 	if( tlv ){
-		Kopete::Message msg( chatSession->members().getFirst(), chatSession->account()->myself(), i18n("<b>%1</b> has ended the OTR session. You should do the same.").tqarg(chatSession->members().getFirst()->contactId()) , Kopete::Message::Internal, Kopete::Message::RichText  );
+		Kopete::Message msg( chatSession->members().getFirst(), chatSession->account()->myself(), i18n("<b>%1</b> has ended the OTR session. You should do the same.").arg(chatSession->members().getFirst()->contactId()) , Kopete::Message::Internal, Kopete::Message::RichText  );
 		chatSession->appendMessage( msg );
 	
 		OTRPlugin::plugin()->emitGoneSecure( chatSession, 3 );
@@ -628,7 +628,7 @@ void OtrlChatInterface::checkFilePermissions( TQString file ){
 	if( fingerprint != NULL ){
 		int doVerify = KMessageBox::questionYesNo( 
 			NULL, 
-			i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").tqarg( formatContact(session->members().getFirst()->contactId())) + "\n\n" + fingerprint + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"),
+			i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").arg( formatContact(session->members().getFirst()->contactId())) + "\n\n" + fingerprint + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"),
 			i18n("Verify fingerprint")  );
 		if( doVerify == KMessageBox::Yes ){
 			return true;

src/otrplugin.cpp

@@ -143,7 +143,7 @@ OTRPlugin::OTRPlugin( TQObject *parent, const char *name, const TQStringList & /
 	//adding menu to contaclists menubar and contacts popup menu
 	TQStringList policies;
 	policies << i18n("&Default") << i18n("Al&ways") << i18n("&Opportunistic") << i18n("&Manual") << i18n("Ne&ver");
-	otrPolicyMenu = new KSelectAction( i18n( "&OTR Policy" ), TQString::tqfromLatin1("kopete_otr"), 0, actionCollection(), "otr_policy" );
+	otrPolicyMenu = new KSelectAction( i18n( "&OTR Policy" ), TQString::fromLatin1("kopete_otr"), 0, actionCollection(), "otr_policy" );
 	otrPolicyMenu->setItems( policies );
 	otrPolicyMenu->popupMenu()->insertSeparator( 1 );
 	otrPolicyMenu->setEnabled( false );
@@ -222,9 +222,9 @@ void  OTRPlugin::slotEnableOtr( Kopete::ChatSession *session, bool enable ){
 			TQString body = otrlChatInterface->getDefaultQuery( session->account()->accountId() );
 			Kopete::Message msg1( session->account()->myself(), session->members().getFirst(), TQString( body ), Kopete::Message::Outbound );
 			if( otrlChatInterface->privState( session ) > 0 ){
-				body = i18n("Attempting to refresh the OTR session with <b>%1</b>...").tqarg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );
+				body = i18n("Attempting to refresh the OTR session with <b>%1</b>...").arg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );
 			} else {
-				body = i18n("Attempting to start a private OTR session with <b>%1</b>...").tqarg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );				
+				body = i18n("Attempting to start a private OTR session with <b>%1</b>...").arg( otrlChatInterface->formatContact( session->members().getFirst()->contactId() ) );				
 			}
 			Kopete::Message msg2( session->account()->myself(), session->members().getFirst(), body, Kopete::Message::Internal, Kopete::Message::RichText );
 

src/otrpreferences.cpp

@@ -154,7 +154,7 @@ void OTRPreferences::verifyFingerprint(){
 
 	int doVerify = KMessageBox::questionYesNo( 
 		this, 
-		i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").tqarg(preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 0 )) + "\n\n" + preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 3 ) + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"), i18n("Verify fingerprint")  );
+		i18n("Please contact %1 via another secure way and verify that the following Fingerprint is correct:").arg(preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 0 )) + "\n\n" + preferencesDialog->tbFingerprints->text( preferencesDialog->tbFingerprints->currentRow(), 3 ) + "\n\n" + i18n("Are you sure you want to trust this fingerprint?"), i18n("Verify fingerprint")  );
 	
 
 	if( doVerify == KMessageBox::Yes ){
@@ -188,9 +188,9 @@ void OTRPreferences::forgetFingerprint(){
 	}
 }
 
-TQAlignTableItem :: TQAlignTableItem( TQTable *table, EditType editType, const TQString& text, int tqalignment )
+TQAlignTableItem :: TQAlignTableItem( TQTable *table, EditType editType, const TQString& text, int alignment )
 	 : TQTableItem( table, editType, text ) {
-	align = tqalignment;
+	align = alignment;
 }
 
 

src/otrpreferences.h

@@ -56,7 +56,7 @@ private slots: // Public slots
 class TQAlignTableItem : public TQTableItem {
 
 public :
-	TQAlignTableItem(TQTable *table, EditType editType, const TQString& text, int tqalignment);
+	TQAlignTableItem(TQTable *table, EditType editType, const TQString& text, int alignment);
 
 private :
 	int align;

src/otrprefs.ui

@@ -60,7 +60,7 @@
                                 <property name="name">
                                     <cstring>cbKeys</cstring>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>400</width>
                                         <height>32767</height>
@@ -181,7 +181,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>161</height>
@@ -209,7 +209,7 @@
                         </column>
                         <column>
                             <property name="text">
-                                <string>tqStatus</string>
+                                <string>Status</string>
                             </property>
                         </column>
                         <column>

src/privkeypopupui.ui

@@ -45,7 +45,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>72</width>
                     <height>72</height>

src/smppopup.cpp

@@ -35,7 +35,7 @@ SMPPopup::SMPPopup(TQWidget* parent, const char* name, WFlags fl, ConnContext *c
 	this->context = context;
 	this->session = session;
 	this->initiate = initiate;
-	tlText->setText( i18n("Please enter the secret passphrase to authenticate %1:").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
+	tlText->setText( i18n("Please enter the secret passphrase to authenticate %1:").arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
 }
 
 SMPPopup::~SMPPopup()

src/smppopupui.ui

@@ -81,7 +81,7 @@
         <property name="text">
             <string>Please enter the secret passphrase to authenticate this contact.</string>
         </property>
-        <property name="tqalignment">
+        <property name="alignment">
             <set>WordBreak|AlignVCenter</set>
         </property>
     </widget>

src/verifypopup.cpp

@@ -36,9 +36,9 @@ VerifyPopup::VerifyPopup(TQWidget* parent, const char* name, Kopete::ChatSession
 : VerifyPopupUI(parent,name, modal,fl)
 {
 	this->session = session;
-	alContact->setText(i18n("Verify fingerprint for %1.").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
-	alFingerprint->setText(i18n("The received fingerprint is:\n\n%1\n\nContact %2 via another secure channel and verify that this fingerprint is correct.").tqarg(OtrlChatInterface::self()->findActiveFingerprint(session)).tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
-	alVerified->setText(i18n("verified that this is in fact the correct fingerprint for %1").tqarg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
+	alContact->setText(i18n("Verify fingerprint for %1.").arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
+	alFingerprint->setText(i18n("The received fingerprint is:\n\n%1\n\nContact %2 via another secure channel and verify that this fingerprint is correct.").arg(OtrlChatInterface::self()->findActiveFingerprint(session)).arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
+	alVerified->setText(i18n("verified that this is in fact the correct fingerprint for %1").arg(OtrlChatInterface::self()->formatContact(session->members().getFirst()->contactId())));
 	cbVerify->insertItem(i18n("I have not"));
 	cbVerify->insertItem(i18n("I have"));
 	if( OtrlChatInterface::self()->isVerified(session)){

src/verifypopupui.ui

@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>461</width>
                     <height>20</height>
@@ -56,7 +56,7 @@
             <property name="name">
                 <cstring>cbVerify</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>130</width>
                     <height>32767</height>
@@ -80,7 +80,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>