diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
| commit | e46eba349e7029d919b213b7130086503d1e042e (patch) | |
| tree | c99ad6970d22aa80d905a7129d87aa627ae26801 /scripts | |
| parent | df726f3e9706e8264827dc1dc8338225c3b6434f (diff) | |
| download | tdesdk-e46eba349e7029d919b213b7130086503d1e042e.tar.gz tdesdk-e46eba349e7029d919b213b7130086503d1e042e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fixheaders | 6 | ||||
| -rw-r--r-- | scripts/fixkdeincludes | 2 | ||||
| -rw-r--r-- | scripts/kde-devel-vim.vim | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fixheaders b/scripts/fixheaders index 2e1dc579..577b6968 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -57,7 +57,7 @@ $lastdir = '.'; '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject", '`kdDebug\' undeclared \(first use this function\)' => "kdebug", '`kdWarning\' undeclared \(first use this function\)' => "kdebug", - 'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "kpopupmenu", + 'no matching function for call to `KMenuBar::insertItem\(QString, TDEPopupMenu' => "tdepopupmenu", 'no matching function for call to `KMenuBar::' => "kmenubar", 'invalid use of undefined type `class QPointArray' => "qpointarray", 'variable `QPainter \S*\' has initializer but incomplete type' => "qpainter", @@ -84,9 +84,9 @@ $lastdir = '.'; 'invalid use of undefined type `class QLineEdit\'' => "qlineedit", 'invalid use of undefined type `class QComboBox\'' => "qcombobox", 'invalid use of undefined type `class QStyle\'' => "qstyle", - 'invalid use of undefined type `class TDEPopupMenu\'' => "kpopupmenu", + 'invalid use of undefined type `class TDEPopupMenu\'' => "tdepopupmenu", 'invalid use of undefined type `class QPopupMenu\'' => "qpopupmenu", - 'cannot convert `TDEPopupMenu \*\' to `QPopupMenu \*' => "kpopupmenu", + 'cannot convert `TDEPopupMenu \*\' to `QPopupMenu \*' => "tdepopupmenu", 'aggregate `QPopupMenu \S*\' has incomplete type' => "qpopupmenu", 'invalid use of undefined type `class KURL' => "kurl", 'no method `QApplication::' => "qapplication", diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes index 67e11156..0585b735 100644 --- a/scripts/fixkdeincludes +++ b/scripts/fixkdeincludes @@ -118,7 +118,7 @@ $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; 'kapp.h' => "kapplication.h", 'kstddirs.h' => "kstandarddirs.h", 'kuniqueapp.h' => "kuniqueapplication.h", - 'ktmainwindow.h'=> "kmainwindow.h", + 'ktmainwindow.h'=> "tdemainwindow.h", 'kcolorbtn.h' => "kcolorbutton.h", 'kcolordlg.h' => "kcolordialog.h", 'kxmlgui.h' => "kxmlguifactory.h", diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 8e64e399..62b84378 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -237,7 +237,7 @@ function! MapIdentHeader( ident ) elseif a:ident == 'TDEConfigGroup' return '<tdeconfigbase.h>' elseif a:ident == 'TDEListViewItem' - return '<klistview.h>' + return '<tdelistview.h>' elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)' return '<kdebug.h>' elseif a:ident == 'kapp' |