diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog index 30fca6cd..aaf99fcb 100644 --- a/ktalkd/ChangeLog +++ b/ktalkd/ChangeLog @@ -361,7 +361,7 @@ 1998-04-15 David Faure (0.5.1) - ktalkd doesn't use anymore kdedir() because it's protected. + ktalkd doesn't use anymore tdedir() because it's protected. It sets now $KDEBINDIR, for portable ktalkdrc files. KDEBINDIR is determined by a call to the kde_bindir() function. Makefile doesn't define TALKD_CONF anymore for compilation : diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index f67ffccc..67b9378e 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -143,10 +143,10 @@ void KWiFiManagerApp::init_whois_db () { KStandardDirs finder; - TQString kdedir = + TQString tdedir = finder.findResourceDir ("data", "kwifimanager/locations/NOWHERE.loc"); - kdedir += "kwifimanager/locations/"; - TQDir *locations = new TQDir (kdedir); + tdedir += "kwifimanager/locations/"; + TQDir *locations = new TQDir (tdedir); if (!locations->exists ()) kdDebug () << "A grave error occurred while searching for files with AccessPoint information." << endl; @@ -158,7 +158,7 @@ KWiFiManagerApp::init_whois_db () { if ((*it) != "." && (*it) != "..") { - TQFile datei (kdedir + (*it)); + TQFile datei (tdedir + (*it)); datei.open (IO_ReadOnly); while (datei.readLine (content, 255) != -1) { diff --git a/wifi/picture.cpp b/wifi/picture.cpp index 5e4d28c5..1edc9b9b 100644 --- a/wifi/picture.cpp +++ b/wifi/picture.cpp @@ -30,12 +30,12 @@ Picture::Picture (TQWidget * parent, Interface_wireless * device):TQWidget (pare { this->device = device; KStandardDirs finder; - kdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png"); - kdedir += "kwifimanager/pics/"; - NO_CARD = new TQPixmap (kdedir + "no_card.png"); - AD_HOC = new TQPixmap (kdedir + "ad_hoc.png"); - ALL_ALONE = new TQPixmap (kdedir + "all_alone.png"); - AP_CONNECT = new TQPixmap (kdedir + "ap_connect.png"); + tdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png"); + tdedir += "kwifimanager/pics/"; + NO_CARD = new TQPixmap (tdedir + "no_card.png"); + AD_HOC = new TQPixmap (tdedir + "ad_hoc.png"); + ALL_ALONE = new TQPixmap (tdedir + "all_alone.png"); + AP_CONNECT = new TQPixmap (tdedir + "ap_connect.png"); } TQSize Picture::mySizeHint() { diff --git a/wifi/picture.h b/wifi/picture.h index 4cd7b4d4..05501a5e 100644 --- a/wifi/picture.h +++ b/wifi/picture.h @@ -30,7 +30,7 @@ public: private: void paintEvent (TQPaintEvent *); TQPixmap *NO_CARD, *ALL_ALONE, *AD_HOC, *AP_CONNECT; - TQString kdedir; + TQString tdedir; Interface_wireless *device; }; diff --git a/wifi/strength.cpp b/wifi/strength.cpp index 4ca1dc08..e33a6155 100644 --- a/wifi/strength.cpp +++ b/wifi/strength.cpp @@ -32,14 +32,14 @@ Strength::Strength (TQWidget * parent, Interface_wireless * device):TQWidget (pa { this->device = device; KStandardDirs finder; - kdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png"); - kdedir += "kwifimanager/pics/"; - NOT_CON_OFFLINE_ADHOC = new TQPixmap (kdedir + "offline.png"); - EXCELLENT = new TQPixmap (kdedir + "excellent.png"); - GOOD = new TQPixmap (kdedir + "good.png"); - MARGINAL = new TQPixmap (kdedir + "marginal.png"); - OOR_MINIMUM = new TQPixmap (kdedir + "oor_minimum.png"); - OOR_DOWN = new TQPixmap (kdedir + "oor_down.png"); + tdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png"); + tdedir += "kwifimanager/pics/"; + NOT_CON_OFFLINE_ADHOC = new TQPixmap (tdedir + "offline.png"); + EXCELLENT = new TQPixmap (tdedir + "excellent.png"); + GOOD = new TQPixmap (tdedir + "good.png"); + MARGINAL = new TQPixmap (tdedir + "marginal.png"); + OOR_MINIMUM = new TQPixmap (tdedir + "oor_minimum.png"); + OOR_DOWN = new TQPixmap (tdedir + "oor_down.png"); } TQSize Strength::mySizeHint () diff --git a/wifi/strength.h b/wifi/strength.h index ebac09b7..47efc58f 100644 --- a/wifi/strength.h +++ b/wifi/strength.h @@ -35,7 +35,7 @@ class Strength:public TQWidget public slots: void updateInfo (TQPaintEvent *); private: - TQString kdedir; + TQString tdedir; void paintEvent (TQPaintEvent *); Interface_wireless *device; };