Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 73c978ef8c
commit d9056e4cfc

@ -607,8 +607,8 @@ void Amor::slotMouseClicked(const TQPoint &pos)
if (!mMenu) if (!mMenu)
{ {
KHelpMenu* help = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false); KHelpMenu* help = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false);
KPopupMenu* helpMnu = help->menu(); TDEPopupMenu* helpMnu = help->menu();
mMenu = new KPopupMenu(); mMenu = new TDEPopupMenu();
mMenu->insertTitle("Amor"); // I really don't want this i18n'ed mMenu->insertTitle("Amor"); // I really don't want this i18n'ed
mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); mMenu->insertItem(SmallIcon("configure"), i18n("&Configure..."), this, TQT_SLOT(slotConfigure()));
mMenu->insertSeparator(); mMenu->insertSeparator();

@ -45,7 +45,7 @@ class AmorWidget;
class TQTimer; class TQTimer;
class KWinModule; class KWinModule;
class KPopupMenu; class TDEPopupMenu;
class QueueItem { class QueueItem {
public: public:
@ -134,7 +134,7 @@ private:
TQTimer *mStackTimer; // Restacking timer TQTimer *mStackTimer; // Restacking timer
TQTimer *mBubbleTimer;// Bubble tip timer (GP: I didn't create this one, it had no use when I found it) TQTimer *mBubbleTimer;// Bubble tip timer (GP: I didn't create this one, it had no use when I found it)
AmorDialog *mAmorDialog; // Setup dialog AmorDialog *mAmorDialog; // Setup dialog
KPopupMenu *mMenu; // Our menu TDEPopupMenu *mMenu; // Our menu
time_t mActiveTime; // The time an active event occurred time_t mActiveTime; // The time an active event occurred
TQPoint mCursPos; // The last recorded position of the pointer TQPoint mCursPos; // The last recorded position of the pointer
TQString mTipText; // Text to display in a bubble when possible TQString mTipText; // Text to display in a bubble when possible

@ -81,10 +81,10 @@ Kodometer::Kodometer(TQWidget* parent, const char* name)
// setup help menu // setup help menu
help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
KPopupMenu* helpMnu = help->menu(); TDEPopupMenu* helpMnu = help->menu();
// Make the popup menu // Make the popup menu
menu = new KPopupMenu(); menu = new TDEPopupMenu();
menu->insertTitle(kapp->miniIcon(), TDEGlobal::instance()->aboutData()->programName()); menu->insertTitle(kapp->miniIcon(), TDEGlobal::instance()->aboutData()->programName());

@ -125,7 +125,7 @@ protected:
KImageNumber* totalLabel; KImageNumber* totalLabel;
KImageNumber* speedLabel; KImageNumber* speedLabel;
KPopupMenu* menu; TDEPopupMenu* menu;
KHelpMenu* help; KHelpMenu* help;
int metricID; int metricID;
int autoResetID; int autoResetID;

@ -46,7 +46,7 @@
- don't display ticks in left-click menu - don't display ticks in left-click menu
2003-02-15 Martin Willers <willers@xm-arts.de> 2003-02-15 Martin Willers <willers@xm-arts.de>
- using KActions for start, stop, and configure entries - using TDEActions for start, stop, and configure entries
- display list of configured teas on left-click, - display list of configured teas on left-click,
making one-click starting of a new tea possible making one-click starting of a new tea possible
- some cleanups - some cleanups

@ -18,7 +18,7 @@
- KNotifyClient: passive popup cannot(?) have no timeout - KNotifyClient: passive popup cannot(?) have no timeout
(--> hence no replacement for my own "Popup" action) (--> hence no replacement for my own "Popup" action)
- when steeping, display "stop <teaname>" on left-click, not just "stop" - when steeping, display "stop <teaname>" on left-click, not just "stop"
(not easy when using KAction in a simple way?) (not easy when using TDEAction in a simple way?)
- use QMovie for tea-is-finished-icon instead of two alternating pixmaps? - use QMovie for tea-is-finished-icon instead of two alternating pixmaps?
@ -31,7 +31,7 @@ internals:
(or at least: x-maximize QListView's titles) (or at least: x-maximize QListView's titles)
- somehow make double-click with left button start 'current' tea - somehow make double-click with left button start 'current' tea
without displaying start_menu? without displaying start_menu?
- figure out how to use KAction for "quit"-entry of menu - figure out how to use TDEAction for "quit"-entry of menu
(somehow doesn't work as expected..) (somehow doesn't work as expected..)
- some more tidying of configure-dialog - some more tidying of configure-dialog
(eg. initial position!, initial size) (eg. initial position!, initial size)

@ -117,15 +117,15 @@ TopLevel::TopLevel() : KSystemTray()
listempty = (teas.count() == 0); listempty = (teas.count() == 0);
startAct = new KAction(i18n("&Start"), "1rightarrow", 0, startAct = new TDEAction(i18n("&Start"), "1rightarrow", 0,
TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection(), "start"); TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection(), "start");
stopAct = new KAction(i18n("Sto&p"), "cancel", 0, stopAct = new TDEAction(i18n("Sto&p"), "cancel", 0,
TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop");
confAct = new KAction(i18n("&Configure..."), "configure", 0, confAct = new TDEAction(i18n("&Configure..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure"); TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure");
anonAct = new KAction(i18n("&Anonymous..."), 0, 0, anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(anonymous()), actionCollection(), "anonymous"); TQT_TQOBJECT(this), TQT_SLOT(anonymous()), actionCollection(), "anonymous");
// KAction *quitAct = actionCollection()->action("file_quit"); // TDEAction *quitAct = actionCollection()->action("file_quit");
// create app menu (displayed on right-click) // create app menu (displayed on right-click)
menu = new TQPopupMenu(); menu = new TQPopupMenu();
@ -140,7 +140,7 @@ TopLevel::TopLevel() : KSystemTray()
rebuildTeaMenus(); // populate tops of menus with tea-entries from config rebuildTeaMenus(); // populate tops of menus with tea-entries from config
KHelpMenu* help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); KHelpMenu* help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
KPopupMenu* helpMnu = help->menu(); TDEPopupMenu* helpMnu = help->menu();
start_menu->insertSeparator(); start_menu->insertSeparator();
anonAct->plug(start_menu); anonAct->plug(start_menu);

@ -35,7 +35,7 @@
#include <ksystemtray.h> #include <ksystemtray.h>
#include <tqpixmap.h> #include <tqpixmap.h>
class KAction; class TDEAction;
class KDialogBase; class KDialogBase;
class TQCheckBox; class TQCheckBox;
class TimeEdit; class TimeEdit;
@ -109,7 +109,7 @@ private:
TQPixmap mugPixmap, teaNotReadyPixmap, teaAnim1Pixmap, teaAnim2Pixmap; TQPixmap mugPixmap, teaNotReadyPixmap, teaAnim1Pixmap, teaAnim2Pixmap;
KAction *startAct, *stopAct, *confAct, *anonAct; TDEAction *startAct, *stopAct, *confAct, *anonAct;
TQPopupMenu *menu, *steeping_menu, *start_menu; TQPopupMenu *menu, *steeping_menu, *start_menu;
TQListView *listbox; TQListView *listbox;
TQLineEdit *nameEdit, *actionEdit; TQLineEdit *nameEdit, *actionEdit;

@ -85,7 +85,7 @@ kweather::~kweather()
void kweather::initContextMenu() void kweather::initContextMenu()
{ {
mContextMenu = new KPopupMenu(this); mContextMenu = new TDEPopupMenu(this);
mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0); mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0);
mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"), mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"),
this, TQT_SLOT(doReport()), 0, -1, 1); this, TQT_SLOT(doReport()), 0, -1, 1);

@ -26,7 +26,7 @@
class TQTimer; class TQTimer;
class dockwidget; class dockwidget;
class reportView; class reportView;
class KPopupMenu; class TDEPopupMenu;
class WeatherService_stub; class WeatherService_stub;
class TQPalette; class TQPalette;
@ -82,7 +82,7 @@ private: // Private methods
reportView *mReport; reportView *mReport;
DCOPClient *mClient; DCOPClient *mClient;
//DCOPRef *mWeatherService; //DCOPRef *mWeatherService;
KPopupMenu *mContextMenu; TDEPopupMenu *mContextMenu;
WeatherService_stub *mWeatherService; WeatherService_stub *mWeatherService;
KCMultiDialog *settingsDialog; KCMultiDialog *settingsDialog;
TQColor mTextColor; TQColor mTextColor;

@ -67,7 +67,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView" row="1" column="2" rowspan="4" colspan="1"> <widget class="TDEListView" row="1" column="2" rowspan="4" colspan="1">
<column> <column>
<property name="text"> <property name="text">
<string>Selected</string> <string>Selected</string>
@ -128,7 +128,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView" row="1" column="0" rowspan="4" colspan="1"> <widget class="TDEListView" row="1" column="0" rowspan="4" colspan="1">
<column> <column>
<property name="text"> <property name="text">
<string>All</string> <string>All</string>

@ -49,7 +49,7 @@
WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name) WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name)
: KMainWindow(parent, name) : TDEMainWindow(parent, name)
{ {
TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translation TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translation

@ -37,7 +37,7 @@ class MapWidget;
class ZoneClockPanel; class ZoneClockPanel;
class WorldWideWatch : public KMainWindow class WorldWideWatch : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT

Loading…
Cancel
Save