[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/jabber
From: Pali Rohár <pali.rohar () gmail ! com>
Date: 2013-06-04 22:33:13
Message-ID: 20130604223313.5E065AC85D () svn ! kde ! org
[Download RAW message or body]
SVN commit 1356914 by pali:
Remove Qt3Support and KDE3Support dependences from jabber protocol
M +2 -2 CMakeLists.txt
M +1 -0 jabbercapabilitiesmanager.cpp
M +6 -5 jabberformtranslator.cpp
M +6 -5 jabberxdatawidget.cpp
M +0 -1 kioslave/jabberdisco.cpp
M +0 -1 kioslave/jabberdisco.h
M +0 -1 ui/dlgjabberchatroomslist.cpp
M +0 -21 ui/dlgjabberchooseserver.ui
M +0 -1 ui/dlgjabberregister.h
M +0 -1 ui/dlgjabberservices.h
M +1 -1 ui/dlgjabbervcard.cpp
M +0 -1 ui/jabberaddcontactpage.h
M +0 -1 ui/jabberchooseserver.cpp
M +0 -1 ui/jabberchooseserver.h
M +0 -1 ui/jabbereditaccountwidget.cpp
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/CMakeLists.txt #1356913:1356914
@@ -1,4 +1,4 @@
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DIRIS_XMPP_JID_DEPRECATED)
+add_definitions(-DIRIS_XMPP_JID_DEPRECATED)
# if using patched libiris version, enable kopete features
add_definitions(-DIRIS_FILE_TRANSFER_PREVIEW -DIRIS_SOCKET_ACCESS \
-DIRIS_XEP_0115_HASH_ATTRIBUTE -DIRIS_XEP_0184_ID_ATTRIBUTE -DIRIS_XEP_0027_XSIGNED) \
@@ -162,7 +162,7 @@ kde4_add_plugin(kopete_jabber ${kopete_jabber_PART_SRCS})
-target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} \
${KDE4_SOLID_LIBS} kopete iris_kopete) +target_link_libraries(kopete_jabber \
${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QCA2_LIBRARIES} ${KDE4_SOLID_LIBS} kopete \
iris_kopete) if(BUILD_JINGLE)
target_link_libraries(kopete_jabber ortp asound speex)
endif(BUILD_JINGLE)
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp \
#1356913:1356914 @@ -27,6 +27,7 @@
#include <qdom.h>
#include <qtextstream.h>
#include <qfile.h>
+#include <qtextcodec.h>
#include <kstandarddirs.h>
#include <kdebug.h>
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberformtranslator.cpp \
#1356913:1356914 @@ -17,9 +17,8 @@
#include "jabberformtranslator.h"
#include <qlabel.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3GridLayout>
+#include <QVBoxLayout>
+#include <QGridLayout>
#include <kdebug.h>
@@ -35,7 +34,8 @@
emptyForm = privForm;
/* Add instructions to layout. */
- Q3VBoxLayout *innerLayout = new Q3VBoxLayout (this, 0, 4);
+ QVBoxLayout *innerLayout = new QVBoxLayout (this);
+ innerLayout->setSpacing (4);
QLabel *label = new QLabel (form.instructions (), this);
label->setWordWrap (true);
@@ -45,7 +45,8 @@
innerLayout->addWidget (label, 0);
- Q3GridLayout *formLayout = new Q3GridLayout (innerLayout, form.count (), 2);
+ QGridLayout *formLayout = new QGridLayout (this);
+ formLayout->addLayout (innerLayout, form.count (), 2);
int row = 1;
XMPP::Form::const_iterator formEnd = form.end ();
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberxdatawidget.cpp \
#1356913:1356914 @@ -120,7 +120,7 @@
}
QLabel *label = new QLabel("<qt>" + text + "</qt>", parent);
label->setWordWrap(true);
- layout->addMultiCellWidget(label, row, row, 0, 2);
+ layout->addWidget(label, row, 0, 1, 3);
if(!f.desc().isEmpty())
label->setToolTip(f.desc());
@@ -151,7 +151,7 @@
combo = new QComboBox(parent);
layout->addWidget(combo, row, 1);
- combo->setInsertionPolicy(QComboBox::NoInsertion);
+ combo->setInsertPolicy(QComboBox::NoInsert);
QString sel;
if (!f.value().isEmpty())
sel = f.value().first();
@@ -163,7 +163,7 @@
lbl = (*it).value;
combo->addItem(lbl);
if ((*it).value == sel)
- combo->setCurrentText(lbl);
+ combo->setItemText(combo->currentIndex(), lbl);
}
QLabel *req = new QLabel(reqText(), parent);
@@ -307,7 +307,7 @@
virtual XMPP::XData::Field field() const
{
XMPP::XData::Field f = XDataWidgetField::field();
- f.setValue(QStringList::split("\n", edit->text(), true));
+ f.setValue(edit->toPlainText().split('\n'));
return f;
}
@@ -440,7 +440,8 @@
break;
}
}
- QGridLayout *formLayout = new QGridLayout(this, fields, 3);
+ QGridLayout *formLayout = new QGridLayout(parent);
+ //formLayout->addLayout(this, fields, 3);
//formLayout->setSizeConstraint(QLayout::SetMinimumSize);
int row = 0;
if(!data.instructions().isEmpty())
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/kioslave/jabberdisco.cpp \
#1356913:1356914 @@ -22,7 +22,6 @@
#include <kdebug.h>
#include <stdlib.h>
-#include <q3cstring.h>
#include <qthread.h>
#include <klocale.h>
#include <kmessagebox.h>
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/kioslave/jabberdisco.h \
#1356913:1356914 @@ -22,7 +22,6 @@
#include <qobject.h>
#include <qstring.h>
-#include <q3cstring.h>
#include <kurl.h>
#include <kio/global.h>
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp \
#1356913:1356914 @@ -14,7 +14,6 @@
#include <klocale.h>
#include <kdebug.h>
-#include <q3table.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qlabel.h>
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui \
#1356913:1356914 @@ -25,18 +25,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="2" column="0" >
- <widget class="K3ActiveLabel" name="linkServerDetails" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
<item row="1" column="0" >
<widget class="QLabel" name="lblStatus" >
<property name="text" >
@@ -78,15 +66,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>K3ActiveLabel</class>
- <extends>QWidget</extends>
- <header>k3activelabel.h</header>
- <container>0</container>
- <pixmap></pixmap>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabberregister.h \
#1356913:1356914 @@ -21,7 +21,6 @@
#include <qwidget.h>
#include <qlayout.h>
-#include <q3groupbox.h>
#include <qlabel.h>
#include "im.h"
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabberservices.h \
#1356913:1356914 @@ -25,7 +25,6 @@
#include "xmpp_tasks.h"
#include "ui_dlgservices.h"
-#include <q3listview.h>
/**
*@author Till Gerken <till@tantalo.net>
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/dlgjabbervcard.cpp \
#1356913:1356914 @@ -405,7 +405,7 @@
QImage image( photoPath );
QByteArray ba;
QBuffer buffer( &ba );
- buffer.open( IO_WriteOnly );
+ buffer.open( QIODevice::WriteOnly );
image.save( &buffer, "PNG" );
vCard.setPhoto( ba );
}
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabberaddcontactpage.h \
#1356913:1356914 @@ -21,7 +21,6 @@
#define JABBERADDCONTACTPAGE_H
#include <addcontactpage.h>
-//Added by qt3to4:
#include <QLabel>
/**
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabberchooseserver.cpp \
#1356913:1356914 @@ -28,7 +28,6 @@
#include <kio/global.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
-#include <q3table.h>
#include <qlabel.h>
#include "jabberprotocol.h"
#include "ui_dlgjabberchooseserver.h"
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabberchooseserver.h \
#1356913:1356914 @@ -21,7 +21,6 @@
#define JABBERCHOOSESERVER_H
#include <kdialog.h>
-#include <q3cstring.h>
class JabberRegisterAccount;
namespace Ui { class DlgJabberChooseServer; }
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp \
#1356913:1356914 @@ -23,7 +23,6 @@
#include <qcheckbox.h>
#include <qpushbutton.h>
#include <qspinbox.h>
-#include <q3combobox.h>
#include <qlabel.h>
#include <kconfig.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic