diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:27 -0600 |
| commit | c664d00793184b3f6580af17fe102449c41e85bd (patch) | |
| tree | ca31ce23dc565779b3930993fcd9f6d1d63f82bc | |
| parent | bdcdc67549e95c360da03dee32d5ca4bd7474c30 (diff) | |
| download | knights-c664d00793184b3f6580af17fe102449c41e85bd.tar.gz knights-c664d00793184b3f6580af17fe102449c41e85bd.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | knights/knights.cpp | 2 | ||||
| -rw-r--r-- | knights/knights.h | 4 | ||||
| -rw-r--r-- | knights/main.cpp | 6 | ||||
| -rw-r--r-- | knights/resource.cpp | 2 | ||||
| -rw-r--r-- | knights/resource.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/knights/knights.cpp b/knights/knights.cpp index f8f3d95..8b5f7c0 100644 --- a/knights/knights.cpp +++ b/knights/knights.cpp @@ -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; diff --git a/knights/knights.h b/knights/knights.h index 1583dad..b1949aa 100644 --- a/knights/knights.h +++ b/knights/knights.h @@ -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; diff --git a/knights/main.cpp b/knights/main.cpp index 86bb003..740af1a 100644 --- a/knights/main.cpp +++ b/knights/main.cpp @@ -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); diff --git a/knights/resource.cpp b/knights/resource.cpp index 2c5cbb1..4dfc022 100644 --- a/knights/resource.cpp +++ b/knights/resource.cpp @@ -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 diff --git a/knights/resource.h b/knights/resource.h index 3704ca6..d72352b 100644 --- a/knights/resource.h +++ b/knights/resource.h @@ -171,7 +171,7 @@ class resource char Type[4]; char Strength[4]; - resource( KCmdLineArgs *args ); + resource( TDECmdLineArgs *args ); ~resource(); void ConfigRead( void ); |