diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:14 -0600 |
| commit | 5fd81915030aa3ff5891b8abf79d66a35a68a637 (patch) | |
| tree | c170222971e47284539105cfa9b1f4937448fd55 /src | |
| parent | 55639fec41714601e4d6ec7643438c7ec2e67065 (diff) | |
| download | kvkbd-5fd81915030aa3ff5891b8abf79d66a35a68a637.tar.gz kvkbd-5fd81915030aa3ff5891b8abf79d66a35a68a637.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/MainWidget.cpp | 2 | ||||
| -rw-r--r-- | src/MainWidget.h | 2 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp index af0e731..7ce4432 100644 --- a/src/MainWidget.cpp +++ b/src/MainWidget.cpp @@ -47,7 +47,7 @@ bool shutting=false; -MainWidget::MainWidget ( KAboutData *about, bool tren, TQWidget *parent, const char * name, WFlags f ) : ResizableDragWidget ( parent,name,f ), stand_alone(tren) +MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const char * name, WFlags f ) : ResizableDragWidget ( parent,name,f ), stand_alone(tren) { diff --git a/src/MainWidget.h b/src/MainWidget.h index de38b01..950799b 100644 --- a/src/MainWidget.h +++ b/src/MainWidget.h @@ -43,7 +43,7 @@ class MainWidget : public ResizableDragWidget Q_OBJECT public: - MainWidget(KAboutData *about=0, bool tren=false, TQWidget *parent=0,const char *name="", WFlags f=WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder); + MainWidget(TDEAboutData *about=0, bool tren=false, TQWidget *parent=0,const char *name="", WFlags f=WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder); void mappingNotify(XMappingEvent *e); void finishInit(); bool close ( bool alsoDelete ); diff --git a/src/main.cpp b/src/main.cpp index 61253cc..3481d8a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -93,7 +93,7 @@ public: MainWidget *main = (MainWidget *)mainWidget(); if (!main) { - main = new MainWidget(const_cast<KAboutData *>(aboutData()),false, 0, "kvkbd"); + main = new MainWidget(const_cast<TDEAboutData *>(aboutData()),false, 0, "kvkbd"); setMainWidget(main); } @@ -183,8 +183,8 @@ public: int main(int argc, char **argv) { - KAboutData about("kvkbd", I18N_NOOP("kvkbd"), version, description, - KAboutData::License_GPL, "(C) 2007 Todor Gyumyushev", 0, 0, "yodor@developer.bg"); + TDEAboutData about("kvkbd", I18N_NOOP("kvkbd"), version, description, + TDEAboutData::License_GPL, "(C) 2007 Todor Gyumyushev", 0, 0, "yodor@developer.bg"); about.addAuthor( "Todor Gyumyushev", 0, "yodor@developer.bg" ); int alone=0; |