diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-19 10:10:04 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-19 10:10:04 +0900 |
| commit | ff3b9cbad7182856bb6fe35e950b40d2848e49e3 (patch) | |
| tree | 2627a6db19152c8d87beed8ceb5887a1bf9b73e0 /redhat/tdenetwork/kdenetwork-kopete-gcc45.patch | |
| parent | bb1e02c097fa27c54e1723cf1640fd9abf8c2e80 (diff) | |
| parent | b044078982873fc5e30a2bb79b4bcd65e5ae806a (diff) | |
| download | tde-packaging-ff3b9cbad7182856bb6fe35e950b40d2848e49e3.tar.gz tde-packaging-ff3b9cbad7182856bb6fe35e950b40d2848e49e3.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdenetwork/kdenetwork-kopete-gcc45.patch')
| -rw-r--r-- | redhat/tdenetwork/kdenetwork-kopete-gcc45.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/redhat/tdenetwork/kdenetwork-kopete-gcc45.patch b/redhat/tdenetwork/kdenetwork-kopete-gcc45.patch deleted file mode 100644 index f93e68922..000000000 --- a/redhat/tdenetwork/kdenetwork-kopete-gcc45.patch +++ /dev/null @@ -1,57 +0,0 @@ -*** kdenetwork/kopete/protocols/testbed/testbedaccount.h.ORI 2011-08-24 00:30:58.403965000 +0200 ---- kdenetwork/kopete/protocols/testbed/testbedaccount.h 2011-08-24 00:31:29.706965000 +0200 -*************** -*** 59,65 **** - /** - * 'Connect' to the testbed server. Only sets myself() online. - */ -! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus::OnlineStatus() ); - /** - * Disconnect from the server. Only sets myself() offline. - */ ---- 59,65 ---- - /** - * 'Connect' to the testbed server. Only sets myself() online. - */ -! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ); - /** - * Disconnect from the server. Only sets myself() offline. - */ -*** kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp.ORI 2011-08-24 00:28:22.080965001 +0200 ---- kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp 2011-08-24 00:28:36.149965002 +0200 -*************** -*** 175,181 **** - // the sorting itself is rather slow. Therefore we call delayedSort, which tries - // to group multiple sort requests into one. - using namespace Kopete::UI::ListView; -! if ( ListView::ListView *lv = dynamic_cast<ListView::ListView *>( listView() ) ) - lv->delayedSort(); - else - listView()->sort(); ---- 175,181 ---- - // the sorting itself is rather slow. Therefore we call delayedSort, which tries - // to group multiple sort requests into one. - using namespace Kopete::UI::ListView; -! if ( ListView *lv = dynamic_cast<ListView *>( listView() ) ) - lv->delayedSort(); - else - listView()->sort(); -*** kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp.ORI 2011-08-24 00:29:00.953965001 +0200 ---- kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp 2011-08-24 00:29:21.080965001 +0200 -*************** -*** 38,44 **** - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) - : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) - { -! KopeteRichTextEditPart::KopeteRichTextEditPart( wparent, wname, false ); - } - - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) ---- 38,44 ---- - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) - : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) - { -! KopeteRichTextEditPart( wparent, wname, false ); - } - - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) |