Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 0a65b5f160
commit 8668a55e03

@ -44,10 +44,10 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
bgColor = cg.color( TQColorGroup::Background); bgColor = cg.color( TQColorGroup::Background);
else { else {
#if KDE_IS_VERSION(3,4,0) #if KDE_IS_VERSION(3,4,0)
bgColor = ((KListViewItem*)this)->backgroundColor(column); bgColor = ((TDEListViewItem*)this)->backgroundColor(column);
#else #else
bgColor = ((KListViewItem*)this)->backgroundColor(); bgColor = ((TDEListViewItem*)this)->backgroundColor();
#endif #endif
} }
@ -165,7 +165,7 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
} }
default: default:
KListViewItem::paintCell(p, cg, column, width, alignment); TDEListViewItem::paintCell(p, cg, column, width, alignment);
} //switch } //switch
} }

@ -28,14 +28,14 @@
#include <klistview.h> #include <klistview.h>
#include <kmessagebox.h> #include <kmessagebox.h>
class NetListViewItem : public KListViewItem class NetListViewItem : public TDEListViewItem
{ {
public: public:
//NetListViewItem(KListView *parent) : KListViewItem(parent) {} //NetListViewItem(TDEListView *parent) : TDEListViewItem(parent) {}
//NetListViewItem(KListView *parent, KListViewItem *after) : KListViewItem(parent, after) {} //NetListViewItem(TDEListView *parent, TDEListViewItem *after) : TDEListViewItem(parent, after) {}
//NetListViewItem(KListView *parent, KListViewItem *after, TQString essid, TQString mode) : KListViewItem(parent, after, essid, mode) {} //NetListViewItem(TDEListView *parent, TDEListViewItem *after, TQString essid, TQString mode) : TDEListViewItem(parent, after, essid, mode) {}
NetListViewItem(KListView *parent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 ) NetListViewItem(TDEListView *parent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 )
: KListViewItem(parent, TQString(), TQString(), TQString(), TQString(), TQString()) : TDEListViewItem(parent, TQString(), TQString(), TQString(), TQString(), TQString())
{ {
mEssid = essid; mEssid = essid;
mChannel = chan; mChannel = chan;

@ -264,7 +264,7 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KListView" row="0" column="0"> <widget class="TDEListView" row="0" column="0">
<column> <column>
<property name="text"> <property name="text">
<string>ESSID</string> <string>ESSID</string>

@ -1030,7 +1030,7 @@ void WirelessAssistant::showItemContextMenu( TQListViewItem* i, const TQPoint& p
if (search == "any") search = nvi->essid(); if (search == "any") search = nvi->essid();
bool isConfigured = setNetParamsFromConfig(search); bool isConfigured = setNetParamsFromConfig(search);
KPopupMenu *icm = new KPopupMenu(); TDEPopupMenu *icm = new TDEPopupMenu();
icm->insertTitle(nvi->essid()); icm->insertTitle(nvi->essid());
if (isConfigured) { if (isConfigured) {
if (nvi->isConnected()) { if (nvi->isConnected()) {

Loading…
Cancel
Save