Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent d9af28e574
commit 556d8aa222

@ -44,7 +44,7 @@
#include "daemon.h" #include "daemon.h"
NotifierContainer* GTKNotifierContainer = NULL; NotifierContainer* GTKNotifierContainer = NULL;
void real_handleGTKMain(); void real_handleGTTDEMain();
NotifierContainer::NotifierContainer() : TQWidget() { NotifierContainer::NotifierContainer() : TQWidget() {
mPopupList.clear(); mPopupList.clear();
@ -59,8 +59,8 @@ NotifierContainer::NotifierContainer() : TQWidget() {
NotifierContainer::~NotifierContainer() { NotifierContainer::~NotifierContainer() {
} }
void NotifierContainer::handleGTKMain() { void NotifierContainer::handleGTTDEMain() {
real_handleGTKMain(); real_handleGTTDEMain();
} }
void NotifierContainer::displayMessage(TQString title, TQString message, TQString icon, int x, int y) { void NotifierContainer::displayMessage(TQString title, TQString message, TQString icon, int x, int y) {
@ -356,7 +356,7 @@ main(int argc, char **argv)
app.setMainWidget(&nc); app.setMainWidget(&nc);
GTKNotifierContainer = &nc; GTKNotifierContainer = &nc;
TQTimer *gtkEventProcessor = new TQTimer( &app ); TQTimer *gtkEventProcessor = new TQTimer( &app );
TQObject::connect( gtkEventProcessor, SIGNAL(timeout()), &nc, SLOT(handleGTKMain()) ); TQObject::connect( gtkEventProcessor, SIGNAL(timeout()), &nc, SLOT(handleGTTDEMain()) );
gtkEventProcessor->start( 100, FALSE ); // Every 0.1 seconds poll gtk for DBUS events gtkEventProcessor->start( 100, FALSE ); // Every 0.1 seconds poll gtk for DBUS events
app.disableSessionManagement(); app.disableSessionManagement();
app.exec(); app.exec();
@ -364,7 +364,7 @@ main(int argc, char **argv)
return 0; return 0;
} }
void real_handleGTKMain() { void real_handleGTTDEMain() {
while (gtk_events_pending()) while (gtk_events_pending())
gtk_main_iteration(); gtk_main_iteration();
} }

@ -38,7 +38,7 @@ public:
void processEvents(); void processEvents();
public slots: public slots:
void handleGTKMain(); void handleGTTDEMain();
void popupClosed(KPassivePopup*); void popupClosed(KPassivePopup*);
private: private:

Loading…
Cancel
Save