diff options
Diffstat (limited to 'kicker/applets/menu/menuapplet.cpp')
| -rw-r--r-- | kicker/applets/menu/menuapplet.cpp | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index f95e4e4c5..d1aae0268 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  extern "C"  { -    KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) +    TDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )      {        TDEGlobal::locale()->insertCatalogue("kmenuapplet");        return new KickerMenuApplet::Applet( configFile_P, parent_P ); @@ -89,8 +89,8 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )      setBackgroundOrigin(AncestorOrigin);      dcopclient.registerAs( "menuapplet", false );      // toolbarAppearanceChanged(int) is sent when changing macstyle -    connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )), -        this, TQT_SLOT( readSettings())); +    connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )), +        this, TQ_SLOT( readSettings()));      claimSelection();      readSettings();      updateTopEdgeOffset(); @@ -298,11 +298,11 @@ void Applet::claimSelection()  	{          delete selection_watcher;          selection_watcher = NULL; -        connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); +        connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection()));          module = new KWinModule; -	connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId ))); -	connect( module, TQT_SIGNAL( activeWindowChanged( WId )), -	    this, TQT_SLOT( activeWindowChanged( WId ))); +	connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId ))); +	connect( module, TQ_SIGNAL( activeWindowChanged( WId )), +	    this, TQ_SLOT( activeWindowChanged( WId )));  	TQValueList< WId > windows = module->windows();  	for( TQValueList< WId >::ConstIterator it = windows.begin();  	     it != windows.end(); @@ -328,7 +328,7 @@ void Applet::lostSelection()      if( selection_watcher == NULL )          {          selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); -        connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); +        connect( selection_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( claimSelection()));          }      delete module;      module = NULL; @@ -476,7 +476,7 @@ void MenuEmbed::setMinimumSize( int w, int h )          assert( msg_type_atom != None );          ev.xclient.message_type = msg_type_atom;          ev.xclient.format = 32; -        ev.xclient.data.l[0] = GET_QT_X_TIME(); +        ev.xclient.data.l[0] = get_tqt_x_time();          ev.xclient.data.l[1] = minimumWidth();          ev.xclient.data.l[2] = minimumHeight();          ev.xclient.data.l[3] = 0; | 
