Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent 55639fec41
commit 5fd8191503

@ -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)
{

@ -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 );

@ -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;

Loading…
Cancel
Save