diff --git a/knights/board_2d.cpp b/knights/board_2d.cpp index b231be5..5f69f28 100644 --- a/knights/board_2d.cpp +++ b/knights/board_2d.cpp @@ -638,7 +638,7 @@ TQPixmap board_2d::getChessman( const int &pos ) } if( ( pos == premoveFrom ) || ( pos == premoveTo ) ) { - KIconEffect::semiTransparent( tmp ); + TDEIconEffect::semiTransparent( tmp ); } return tmp; } diff --git a/knights/challenge_graph.cpp b/knights/challenge_graph.cpp index e84a95e..8704046 100644 --- a/knights/challenge_graph.cpp +++ b/knights/challenge_graph.cpp @@ -78,7 +78,7 @@ Challenge_Graph::Challenge_Graph( TQWidget* parent, const char* name, resource * menuSeek->insertItem( i18n("Tell..."), this, TQT_SLOT( menuFunct(int) ), 0, MENU_TELL ); menuSeek->insertItem( i18n("Assess..."), this, TQT_SLOT( menuFunct(int) ), 0, MENU_ASSESS ); menuSeek->insertItem( i18n("Player Info"), this, TQT_SLOT( menuFunct(int) ), 0, MENU_FINGER ); - menuSeek->insertItem( TQIconSet( myResource->LoadIcon( TQString("history"), KIcon::Small ) ), + menuSeek->insertItem( TQIconSet( myResource->LoadIcon( TQString("history"), TDEIcon::Small ) ), i18n("Player History"), this, TQT_SLOT( menuFunct(int) ), 0, MENU_HISTORY ); menuSeek->insertSeparator(); menuSeek->insertItem( i18n("Add to Friends"), this, TQT_SLOT( menuFunct(int) ), 0, MENU_NOTIFY ); diff --git a/knights/dlg_engine.cpp b/knights/dlg_engine.cpp index 03a8f50..6a1eec3 100644 --- a/knights/dlg_engine.cpp +++ b/knights/dlg_engine.cpp @@ -61,8 +61,8 @@ dlg_engine::dlg_engine(TQWidget *parent, const char *name, resource *Rsrc, TQStr EDIT_LogFile = new KLineEdit( BOX_LogFile ); BUTTON_LogFile = new TQPushButton( BOX_LogFile ); setMainWidget( BOX_Parent ); - BUTTON_Filename->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); - BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + BUTTON_Filename->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); + BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); EDIT_Name->setMinimumWidth( 150 ); EDIT_Filename->setMinimumWidth( 300 ); EDIT_Arguments->setMinimumWidth( 300 ); diff --git a/knights/dlg_server.cpp b/knights/dlg_server.cpp index e7e1cad..0858694 100644 --- a/knights/dlg_server.cpp +++ b/knights/dlg_server.cpp @@ -80,7 +80,7 @@ dlg_server::dlg_server(TQWidget *parent, const char *name, resource *Rsrc, TQStr BOX_Parent ); EDIT_Timeseal = new KLineEdit( GROUP_Timeseal ); BUTTON_Timeseal = new TQPushButton( GROUP_Timeseal ); - BUTTON_Timeseal->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + BUTTON_Timeseal->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); connect( BUTTON_Timeseal, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slot_Timeseal() ) ); BOX_LogFile = new TQGroupBox( 2, @@ -91,7 +91,7 @@ dlg_server::dlg_server(TQWidget *parent, const char *name, resource *Rsrc, TQStr BUTTON_LogFile = new TQPushButton( BOX_LogFile ); setMainWidget( BOX_Parent ); - BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); EDIT_Name->setMinimumWidth( 120 ); EDIT_URL->setMinimumWidth( 120 ); EDIT_UserName->setMinimumWidth( 120 ); diff --git a/knights/dlg_settings.cpp b/knights/dlg_settings.cpp index c401767..2520126 100644 --- a/knights/dlg_settings.cpp +++ b/knights/dlg_settings.cpp @@ -61,21 +61,21 @@ dlg_settings::dlg_settings(TQWidget *parent, const char *name, resource *Rsrc ) /* Audio Page */ FRAME_Audio = addPage( i18n( "Audio" ), i18n( "These settings determine what Knights sounds like." ), - Resource->LoadIcon( TQString("multimedia"), KIcon::Panel ) ); + Resource->LoadIcon( TQString("multimedia"), TDEIcon::Panel ) ); PAGE_Audio = new setPageAudio( FRAME_Audio, Resource ); connect( PAGE_Audio, TQT_SIGNAL( enableApply() ), this, TQT_SLOT( slotEnableApply() ) ); /* Engines Page */ FRAME_Engines = addPage( i18n( "Computer Opponents" ), i18n( "Configure your chess engines here." ), - Resource->LoadIcon( TQString("gear"), KIcon::Panel ) ); + Resource->LoadIcon( TQString("gear"), TDEIcon::Panel ) ); PAGE_Engines = new setPageEngines( FRAME_Engines, Resource ); connect( PAGE_Engines, TQT_SIGNAL( enableApply() ), this, TQT_SLOT( slotEnableApply() ) ); /* Servers Page */ FRAME_Servers = addPage( i18n( "Chess Servers" ), i18n( "Configure your internet chess servers here." ), - Resource->LoadIcon( TQString("network"), KIcon::Panel ) ); + Resource->LoadIcon( TQString("network"), TDEIcon::Panel ) ); PAGE_Servers = new setPageServers( FRAME_Servers, Resource ); connect( PAGE_Servers, TQT_SIGNAL( enableApply() ), this, TQT_SLOT( slotEnableApply() ) ); diff --git a/knights/knights.cpp b/knights/knights.cpp index 44b108a..7c14b10 100644 --- a/knights/knights.cpp +++ b/knights/knights.cpp @@ -247,7 +247,7 @@ void Knights::initMenus( void ) matchMenu->insertItem( i18n( "&Draw" ), drawMenu, MENU_DRAW ); matchMenu->setItemEnabled( MENU_DRAW, FALSE ); // MENU_RETRACT - matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("undo"), KIcon::Small ) ), + matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("undo"), TDEIcon::Small ) ), i18n( "&Retract Move" ), Core, TQT_SLOT(matchMenu(int)), 0, MENU_RETRACT ); matchMenu->setItemEnabled( MENU_RETRACT, FALSE ); matchMenu->setWhatsThis( MENU_RETRACT, i18n( "Select this to retract your last move." ) ); @@ -278,7 +278,7 @@ void Knights::initMenus( void ) matchMenu->setWhatsThis( MENU_PONDER, i18n( "This toggles your opponent's ability to think while it's your turn." ) ); matchMenu->insertSeparator(); // MENU_PAUSE - matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("player_pause"), KIcon::Small ) ), + matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("player_pause"), TDEIcon::Small ) ), i18n( "Pause" ), this, TQT_SLOT( Settings(int) ), Key_F12, MENU_PAUSE ); matchMenu->setItemEnabled( MENU_PAUSE, FALSE ); matchMenu->setWhatsThis( MENU_PAUSE, i18n( "Select this to pause the clock for this match." ) ); @@ -301,38 +301,38 @@ void Knights::initMenus( void ) fileMenu menu */ // MENU_NEWGAME - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filenew"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filenew"), TDEIcon::Small ) ), i18n( "&New Match..." ), this, TQT_SLOT( openNewMatchDialog() ), CTRL+Key_N, MENU_NEWGAME ); fileMenu->setWhatsThis( MENU_NEWGAME, i18n( "This allows you to begin a new match." ) ); // MENU_LOAD - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileopen"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileopen"), TDEIcon::Small ) ), i18n( "&Load Match..." ), Core, TQT_SLOT( load() ), CTRL+Key_L, MENU_LOAD ); fileMenu->setWhatsThis( MENU_LOAD, i18n( "The Load command will allow you to select a previously saved match and play it again." ) ); fileMenu->insertSeparator(); // MENU_SAVE - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ), i18n( "&Save Match" ), this, TQT_SLOT( SaveGame() ), CTRL+Key_S, MENU_SAVE ); fileMenu->setItemEnabled( MENU_SAVE, FALSE ); fileMenu->setWhatsThis( MENU_SAVE, i18n( "The Save command will allow you to store a copy of your current match for later use." ) ); // MENU_SAVEAS - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ), i18n( "Save Match &As..." ), this, TQT_SLOT( SaveGameAs() ), CTRL+Key_A, MENU_SAVEAS ); fileMenu->setItemEnabled( MENU_SAVEAS, FALSE ); fileMenu->setWhatsThis( MENU_SAVEAS, i18n( "The Save command will allow you to store a copy of your current match for later use." ) ); fileMenu->insertSeparator(); // MENU_CONNECT - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("connect_creating"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("connect_creating"), TDEIcon::Small ) ), i18n( "Connect to Server" ), this, TQT_SLOT( netConnect() ), CTRL+Key_C, MENU_CONNECT ); fileMenu->setWhatsThis( MENU_CONNECT, i18n( "Clicking this will connect Knights with an internet chess server." ) ); fileMenu->insertSeparator(); // MENU_PRINT - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), TDEIcon::Small ) ), i18n( "&Print Notation..." ), Core, TQT_SLOT( print() ), CTRL+Key_P, MENU_PRINT ); fileMenu->setItemEnabled( MENU_PRINT, FALSE ); fileMenu->setWhatsThis( MENU_PRINT, i18n( "The Print command will allow you to print this game's notation on your printer." ) ); fileMenu->insertSeparator(); // MENU_CLOSE - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), TDEIcon::Small ) ), i18n( "&Close Match" ), Core, TQT_SLOT( clearMatch() ), CTRL+Key_W, MENU_CLOSE ); fileMenu->setItemEnabled( MENU_CLOSE, FALSE ); fileMenu->setWhatsThis( MENU_CLOSE, i18n( "This command removes the current match." ) ); @@ -342,7 +342,7 @@ void Knights::initMenus( void ) fileMenu->setWhatsThis( MENU_CLOSEALL, i18n( "This command will remove all matches that are currently loaded." ) ); fileMenu->insertSeparator(); // MENU_QUIT - fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("exit"), KIcon::Small ) ), + fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("exit"), TDEIcon::Small ) ), i18n( "&Quit" ), this, TQT_SLOT(menuClose()), CTRL+Key_Q, MENU_QUIT ); fileMenu->setWhatsThis( MENU_QUIT, i18n( "The Quit command will stop all matches and exit Knights." ) ); /* @@ -352,11 +352,11 @@ void Knights::initMenus( void ) settingsMenu->insertItem( i18n( "&Install Themes" ), this, TQT_SLOT(installThemes()), 0, MENU_INSTALL_THEMES ); settingsMenu->setWhatsThis( MENU_INSTALL_THEMES, i18n( "This lets you install downloaded themes into Knights." ) ); // MENU_BINDINGS_DIALOG - settingsMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("key_bindings"), KIcon::Small ) ), + settingsMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("key_bindings"), TDEIcon::Small ) ), i18n( "Configure &Key Bindings..." ), this, TQT_SLOT(openKeyBindingDialog()), 0, MENU_BINDINGS_DIALOG ); settingsMenu->setWhatsThis( MENU_BINDINGS_DIALOG, i18n( "Click this if you want to change the keyboard shortcuts that Knights uses." ) ); // MENU_SETTINGS_DIALOG - settingsMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("configure"), KIcon::Small ) ), + settingsMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("configure"), TDEIcon::Small ) ), i18n( "&Configure Knights..." ), this, TQT_SLOT(openSettingsDialog()), 0, MENU_SETTINGS_DIALOG ); settingsMenu->setWhatsThis( MENU_SETTINGS_DIALOG, i18n( "This opens a new window which allows you to customize Knights to your particular tastes." ) ); /* @@ -838,14 +838,14 @@ void Knights::netConnect( void ) if(Core->isOnline()) { fileMenu->changeItem( MENU_CONNECT, TQIconSet( Resource->LoadIcon( TQString("connect_creating"), - KIcon::Small ) ), i18n( "Connect to Server" )); + TDEIcon::Small ) ), i18n( "Connect to Server" )); Core->goOffline(); setCursor( Resource->CURSOR_Standard ); } else { fileMenu->changeItem( MENU_CONNECT, TQIconSet( Resource->LoadIcon( TQString("connect_no"), - KIcon::Small ) ), i18n( "Disconnect from Server" ) ); + TDEIcon::Small ) ), i18n( "Disconnect from Server" ) ); /* By passing Null as the ID, we're telling core that we're creating a new internetio, not reusing an exsisting one. @@ -914,13 +914,13 @@ void Knights::Settings(int opt) if( Core->paused() ) { matchMenu->changeItem( MENU_PAUSE, - TQIconSet( Resource->LoadIcon( TQString("player_pause"), KIcon::Small ) ), + TQIconSet( Resource->LoadIcon( TQString("player_pause"), TDEIcon::Small ) ), i18n( "Pause" ) ); } else { matchMenu->changeItem( MENU_PAUSE, - TQIconSet( Resource->LoadIcon( TQString("1rightarrow"), KIcon::Small ) ), + TQIconSet( Resource->LoadIcon( TQString("1rightarrow"), TDEIcon::Small ) ), i18n( "Resume" ) ); } Core->matchMenu( MENU_PAUSE ); diff --git a/knights/knightstextview.cpp b/knights/knightstextview.cpp index 5287ee6..8f3694f 100644 --- a/knights/knightstextview.cpp +++ b/knights/knightstextview.cpp @@ -40,21 +40,21 @@ KnightsTextView::KnightsTextView(TQWidget *parent, resource *Rsrc ) : TQTextBrow /* Configure functions in the View right click menu */ - menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("editcopy"), KIcon::Small ) ), + menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("editcopy"), TDEIcon::Small ) ), i18n( "&Copy" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_C, MENU_COPY ); menuView->insertItem( i18n("Select &All"), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_A, MENU_SELECT_ALL ); menuView->insertSeparator(); - menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("fileprint"), KIcon::Small ) ), + menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("fileprint"), TDEIcon::Small ) ), i18n( "&Print" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_P, MENU_PRINT ); -// menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("find"), KIcon::Small ) ), +// menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("find"), TDEIcon::Small ) ), // i18n( "&Find" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_F, MENU_FIND ); -// menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("next"), KIcon::Small ) ), +// menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("next"), TDEIcon::Small ) ), // i18n( "Find &Next" ), this, TQT_SLOT( menuFunct(int) ), Key_F3, MENU_FIND_NEXT ); // menuView->insertSeparator(); menuView->insertSeparator(); - menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("viewmag+"), KIcon::Small ) ), + menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("viewmag+"), TDEIcon::Small ) ), i18n( "Zoom &In" ), this, TQT_SLOT( menuFunct(int) ), 0, MENU_ZOOM_IN ); - menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("viewmag-"), KIcon::Small ) ), + menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("viewmag-"), TDEIcon::Small ) ), i18n( "Zoom &Out" ), this, TQT_SLOT( menuFunct(int) ), 0, MENU_ZOOM_OUT ); /* disconnect the linkClicked signal so we can replace it with our own */ diff --git a/knights/resource.cpp b/knights/resource.cpp index a956fd8..a8f4a81 100644 --- a/knights/resource.cpp +++ b/knights/resource.cpp @@ -48,7 +48,7 @@ resource::resource(TDECmdLineArgs *args) { GlobalDataDir = ""; Widget_Height = 20; // prevents max_size error for thinbuttons on init - Icons = new KIconLoader( TQString( "knights" ) ); + Icons = new TDEIconLoader( TQString( "knights" ) ); Audio = new audio(); /* Define ConsoleStyle, our RichText */ @@ -774,7 +774,7 @@ void resource::resizeTheme( const int &size ) /////////////////////////////////////// TQPixmap resource::LoadIcon( TQString Name, int Group ) { - return Icons->loadIcon( Name, (KIcon::Group)Group ); + return Icons->loadIcon( Name, (TDEIcon::Group)Group ); } /////////////////////////////////////// // diff --git a/knights/resource.h b/knights/resource.h index ef83389..3355f78 100644 --- a/knights/resource.h +++ b/knights/resource.h @@ -208,7 +208,7 @@ class resource TQStringList Boards; TQStringList Chessmen; TQStringList Sounds; - KIconLoader *Icons; + TDEIconLoader *Icons; audio *Audio; void ReadEngines( void ); diff --git a/knights/setpagedisplay.cpp b/knights/setpagedisplay.cpp index 32329d1..135d1aa 100644 --- a/knights/setpagedisplay.cpp +++ b/knights/setpagedisplay.cpp @@ -99,7 +99,7 @@ void setPageDisplay::initTab1( void ) EDIT_SCID_Images->setText( Resource->SCID_Image_Path ); connect( EDIT_SCID_Images, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slot_SCID_Images(const TQString&) ) ); BUTTON_SCID_Images = new TQPushButton( GROUP_SCID_Images ); - BUTTON_SCID_Images->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + BUTTON_SCID_Images->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); connect( BUTTON_SCID_Images, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slot_SCID_Images_Button() ) ); GROUP_General_Graphics = new TQGroupBox( 4, @@ -156,7 +156,7 @@ void setPageDisplay::initTab1( void ) /////////////////////////////////////// void setPageDisplay::initTab2( void ) { - TQPixmap ColorsIcon( Resource->LoadIcon( TQString("colorize"), KIcon::Toolbar ) ); + TQPixmap ColorsIcon( Resource->LoadIcon( TQString("colorize"), TDEIcon::Toolbar ) ); Tab2 = new TQFrame( TabParent ); Tab2->setMargin( margin ); diff --git a/knights/setpagegeneral.cpp b/knights/setpagegeneral.cpp index 5db3cd7..3254a93 100644 --- a/knights/setpagegeneral.cpp +++ b/knights/setpagegeneral.cpp @@ -73,7 +73,7 @@ setPageGeneral::setPageGeneral(TQWidget *parent, resource *Rsrc ) : TQVBoxLayout EDIT_PGN_Filename->setText( Resource->PGN_Filename ); connect( EDIT_PGN_Filename, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slot_PGN_Filename(const TQString&) ) ); BUTTON_PGN_Filename = new TQPushButton( BOX_Reuse_PGN ); - BUTTON_PGN_Filename->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); + BUTTON_PGN_Filename->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) ); connect( BUTTON_PGN_Filename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slot_PGN_Filename_Button() ) ); EDIT_PGN_Filename->setEnabled( Resource->OPTION_Reuse_PGN ); BUTTON_PGN_Filename->setEnabled( Resource->OPTION_Reuse_PGN ); diff --git a/knights/tab_seetdelist.cpp b/knights/tab_seetdelist.cpp index 1158004..35df575 100644 --- a/knights/tab_seetdelist.cpp +++ b/knights/tab_seetdelist.cpp @@ -43,7 +43,7 @@ tab_SeekList::tab_SeekList(TQWidget *parent, const char *name, resource *Rsrc ) menuSeek->insertItem( i18n("Tell..."), this, TQT_SLOT( menuFunct(int) ), 0, MENU_TELL ); menuSeek->insertItem( i18n("Assess..."), this, TQT_SLOT( menuFunct(int) ), 0, MENU_ASSESS ); menuSeek->insertItem( i18n("Player Info"), this, TQT_SLOT( menuFunct(int) ), 0, MENU_FINGER ); - menuSeek->insertItem( TQIconSet( myResource->LoadIcon( TQString("history"), KIcon::Small ) ), + menuSeek->insertItem( TQIconSet( myResource->LoadIcon( TQString("history"), TDEIcon::Small ) ), i18n("Player History"), this, TQT_SLOT( menuFunct(int) ), 0, MENU_HISTORY ); menuSeek->insertSeparator(); menuSeek->insertItem( i18n("Add to Friends"), this, TQT_SLOT( menuFunct(int) ), 0, MENU_NOTIFY ); diff --git a/knights/tabpage.cpp b/knights/tabpage.cpp index 58eb953..b571751 100644 --- a/knights/tabpage.cpp +++ b/knights/tabpage.cpp @@ -41,12 +41,12 @@ TabPage::TabPage( TQWidget *parent, TQWidget *child, resource *rsrc ) : TQVBox(p grip = new TabGrip( actionBar ); connect( grip, TQT_SIGNAL( wasDragged(const TQPoint&, const TQPoint&) ), this, TQT_SLOT( tabDragged(const TQPoint&, const TQPoint&) ) ); - KIconLoader icons( TQString( "knights" ) ); - TQPixmap map = icons.loadIcon( TQString("tab_remove"), KIcon::Small, 0, KIcon::DefaultState, 0, TRUE ); + TDEIconLoader icons( TQString( "knights" ) ); + TQPixmap map = icons.loadIcon( TQString("tab_remove"), TDEIcon::Small, 0, TDEIcon::DefaultState, 0, TRUE ); if( map.isNull() ) { /* Keep for backward compatability with KDE 3.0 */ - map = icons.loadIcon( TQString("fileclose"), KIcon::Small ); + map = icons.loadIcon( TQString("fileclose"), TDEIcon::Small ); } closeButton = new TQToolButton( actionBar, "closeButton" ); diff --git a/knights/thinbuttons.cpp b/knights/thinbuttons.cpp index 3bfe297..19f757a 100644 --- a/knights/thinbuttons.cpp +++ b/knights/thinbuttons.cpp @@ -28,15 +28,15 @@ thinbuttons::thinbuttons(TQWidget *parent, const char *name, resource *Rsrc ) : /* Build the pop-up menu */ matchMenu = new TDEPopupMenu( this ); - matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), KIcon::Small ) ), + matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ), i18n("&Save Match"), MENU_SAVE ); - matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), KIcon::Small ) ), + matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ), i18n("Save Match &As..."), MENU_SAVEAS ); matchMenu->insertSeparator(); - matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), KIcon::Small ) ), + matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), TDEIcon::Small ) ), i18n("&Print Notation..."), MENU_PRINT ); matchMenu->insertSeparator(); - matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), KIcon::Small ) ), + matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), TDEIcon::Small ) ), i18n("&Close Match"), MENU_CLOSE ); connect( matchMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( menuClicked(int) ) ); }