Merge branch 'qt-client'

sflphone-client-kde/src/ConfigDialog.cpp

@@ -56,7 +56,6 @@ ConfigurationDialog::ConfigurationDialog(sflphone_kdeView *parent) : QDialog(par
 	toolButton_codecDown->setIcon(style->standardIcon(QStyle::SP_ArrowDown));
 	tableWidget_codecs->verticalHeader()->hide();
 	tableWidget_codecs->setSelectionBehavior(QAbstractItemView::SelectRows);
-	//tableWidget_codecs->setStyleSheet("border-style: hidden;");
 
 
 
@@ -513,12 +512,25 @@ void ConfigurationDialog::loadCodecs()
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	QStringList codecList = configurationManager.getCodecList();
 	QStringList activeCodecList = configurationManager.getActiveCodecList();
+	#if QT_VERSION >= 0x040500
         activeCodecList.removeDuplicates();
+	#else
+   	for (int i = 0 ; i < activeCodecList.size() ; i++)
+		{
+			if(activeCodecList.lastIndexOf(activeCodecList[i]) != i)
+			{
+				activeCodecList.removeAt(i);
+				i--;
+			}
+		}
+	#endif
+
 	for (int i=0 ; i<activeCodecList.size() ; i++)
 	{
 		if(! codecList.contains(activeCodecList[i]))
 		{
 			activeCodecList.removeAt(i);
+			i--;
 		}
 	}
 	QStringList codecListToDisplay = activeCodecList;
@@ -664,6 +676,10 @@ void ConfigurationDialog::on_toolButton_codecUp_clicked()
 		tableWidget_codecs->setItem(currentRow - 1, i , item1);
 		tableWidget_codecs->setItem(currentRow, i , item2);
 	}
+	QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
+	QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow - 1);
+	tableWidget_codecs->setVerticalHeaderItem(currentRow - 1, item1);
+	tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
 	tableWidget_codecs->setCurrentCell(currentRow - 1, currentCol);
 }
 
@@ -680,6 +696,10 @@ void ConfigurationDialog::on_toolButton_codecDown_clicked()
 		tableWidget_codecs->setItem(currentRow + 1, i , item1);
 		tableWidget_codecs->setItem(currentRow, i , item2);
 	}
+	QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
+	QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow + 1);
+	tableWidget_codecs->setVerticalHeaderItem(currentRow + 1, item1);
+	tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
 	tableWidget_codecs->setCurrentCell(currentRow + 1, currentCol);
 }
 

tools/build-system/distributions/mandriva/sflphone-client-kde.spec

@@ -30,6 +30,7 @@ Requires:	libqt4-x11
 BuildRequires:  cmake
 BuildRequires:  libcommoncpp-devel
 BuildRequires:  kdepimlibs4-devel
+BuildRequires:  libqt4-devel >= 4.3
 Conflicts:	sflphone
 Prefix:		%{_prefix}
 

tools/build-system/distributions/opensuse/sflphone-client-kde.spec

@@ -30,6 +30,7 @@ Requires:	libqt4-x11
 BuildRequires:  cmake
 BuildRequires:  libkdepimlibs4-devel
 BuildRequires:  commoncpp2-devel
+BuildRequires:  libqt4-devel >= 4.3
 BuildRequires:	gettext-tools
 Conflicts:	sflphone
 Prefix:		%{_prefix}

tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.intrepid

@@ -2,7 +2,7 @@ Source: sflphone-client-kde
 Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
 Section: kde
 Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
 Standards-Version: 3.7.3
 
 Package: sflphone-client-kde

tools/build-system/distributions/ubuntu/debian-sflphone-client-kde/control.jaunty

@@ -2,7 +2,7 @@ Source: sflphone-client-kde
 Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
 Section: kde
 Priority: optional
-Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
 Standards-Version: 3.7.3
 
 Package: sflphone-client-kde