Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent bdcdc67549
commit c664d00793

@ -40,7 +40,7 @@
#include <tqframe.h>
#include <tqstyle.h>
Knights::Knights(KCmdLineArgs *Args, TQWidget *parent, const char *name) : KMainWindow(parent, name)
Knights::Knights(TDECmdLineArgs *Args, TQWidget *parent, const char *name) : KMainWindow(parent, name)
{
InitAll = TRUE;
ResizeFlag = TRUE;

@ -62,7 +62,7 @@ class Knights : public KMainWindow
KAboutData *aboutData;
resource *Resource;
Knights( KCmdLineArgs *Args, TQWidget* parent=0, const char *name=0 );
Knights( TDECmdLineArgs *Args, TQWidget* parent=0, const char *name=0 );
~Knights();
bool init( void );
void initMenus( void );
@ -117,7 +117,7 @@ class Knights : public KMainWindow
void newMatch( void );
private:
KCmdLineArgs *args;
TDECmdLineArgs *args;
KMenuBar *topMenu;
KPopupMenu *help;
KPopupMenu *fileMenu;

@ -67,9 +67,9 @@ int main(int argc, char *argv[])
aboutData.setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"),
I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"));
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KApplication a;
Knights *knights = new Knights(args);

@ -44,7 +44,7 @@
// resource::resource
//
///////////////////////////////////////
resource::resource(KCmdLineArgs *args)
resource::resource(TDECmdLineArgs *args)
{
GlobalDataDir = "";
Widget_Height = 20; // prevents max_size error for thinbuttons on init

@ -171,7 +171,7 @@ class resource
char Type[4];
char Strength[4];
resource( KCmdLineArgs *args );
resource( TDECmdLineArgs *args );
~resource();
void ConfigRead( void );

Loading…
Cancel
Save